syncano 4.0.0.alpha4 → 4.0.0.pre

data/spec/unit/schema_spec.rb

@@ -1,16 +1,66 @@
 require_relative '../spec_helper'
 
+
+require 'rspec/expectations'
+require 'active_attr/matchers/have_attribute_matcher'
+require 'shoulda-matchers'
+
 describe Syncano::Schema do
-  let(:connection) { double 'connection' }
+  include ActiveAttr::Matchers
+
+  let(:connection) { double("connection") }
+
+  subject { described_class.new connection }
 
   before do
-    expect(connection).to receive(:request).with(:get, described_class.schema_path) { schema }
+    expect(connection).to receive(:request).with(:get, described_class::SCHEMA_PATH) { schema }
+
+    Syncano::Resources.instance_eval do
+      constants.each do |const|
+        if ![:Base, :Collection, :Space].include?(const) && const_defined?(const)
+          remove_const const
+        end
+      end
+    end
   end
 
-  subject { described_class.new(connection) }
+  describe 'process!' do
+    it 'defintes classes according to the schema' do
+      expect { Syncano::Resources::Class }.to raise_error(NameError)
+
+      subject.process!
+
+      expect { Syncano::Resources::Class }.to_not raise_error
+
+      expect(Syncano::Resources::Class).to have_attribute(:name)
+      expect(Syncano::Resources::Class).to have_attribute(:status)
+      expect(Syncano::Resources::Class).to have_attribute(:created_at)
+      expect(Syncano::Resources::Class).to have_attribute(:description)
+      expect(Syncano::Resources::Class).to have_attribute(:updated_at)
+      expect(Syncano::Resources::Class).to have_attribute(:objects_count)
+      expect(Syncano::Resources::Class).to have_attribute(:metadata)
+      expect(Syncano::Resources::Class).to have_attribute(:revision)
+
+      class_instance = Syncano::Resources::Class.new(connection, {}, { links: {} })
+
+      expect(class_instance).to validate_presence_of(:name)
+      expect(class_instance).to validate_length_of(:name).is_at_most(50)
+
+      expect(class_instance).to respond_to(:objects)
+
+      code_box_instance = Syncano::Resources::CodeBox.new(connection, {}, { links: {} })
+      expect(code_box_instance).to validate_inclusion_of(:runtime_name).
+                                             in_array(%w(nodejs ruby python))
+
+    end
+
+    it 'defines foreign keys attributes when attributes names collide with links' do
+      subject.process!
+
+      schedule_instance = Syncano::Resources::Schedule.new connection, {}, links: {}
 
-  specify '#resource_definitions' do
-    expect(subject.definition).to be_kind_of(Hash)
+      expect(schedule_instance).to respond_to(:codebox)
+    end
   end
 
   def schema

data/spec/unit/syncano_spec.rb

@@ -5,59 +5,23 @@ describe Syncano do
   describe '#connect' do
     let(:email) { 'kiszka@koza.com' }
     let(:password) { 'kiszonka' }
-    let(:email_options) { { email: email, password: password } }
+    let(:options) { { email: email, password: password } }
     let(:api_key) { 'kozakoza123' }
 
-    context 'with credentials in options' do
-      context 'email and password' do
-        before do
-          stub_auth_request
-          stub_schema_request
-        end
-
-        specify do
-          expect(Syncano.connect(email_options)).to be_kind_of(Syncano::API)
-        end
-      end
-
-      context 'api key' do
-        before do
-          stub_schema_request
-        end
-
-        specify do
-          expect(Syncano.connect(api_key: api_key)).to be_kind_of(Syncano::API)
-        end
-      end
-    end
-
-    context 'with credentials in ENV variables' do
-      before do
-        @old_api_key = ENV['SYNCANO_API_KEY']
-        ENV['SYNCANO_API_KEY'] = api_key
-
-        stub_schema_request
-      end
-
-      after do
-        ENV['SYNCANO_API_KEY'] = @old_api_key
-      end
-
-      specify { expect(Syncano.connect).to be_kind_of(Syncano::API) }
-    end
+    before do
+      stub_request(:post, endpoint_uri('account/auth/'))
+          .with(body: options)
+          .to_return(status: 200,
+                    body: generate_body(id: 15, email: email, first_name: '', last_name: '', account_key: api_key))
 
-    def stub_schema_request
       stub_request(:get, endpoint_uri('schema/'))
           .with(headers: { 'X-Api-Key' => api_key })
           .to_return(status: 200, body: generate_body([]))
-    end
 
-    def stub_auth_request
-      stub_request(:post, endpoint_uri('account/auth/'))
-          .with(body: email_options)
-          .to_return(status: 200,
-                     body: generate_body(id: 15, email: email, first_name: '', last_name: '', account_key: api_key))
+      expect_any_instance_of(Syncano::Connection)
+          .to receive(:authenticated?)
     end
 
+    specify { expect(Syncano.connect(options)).to be_kind_of(Syncano::API) }
   end
 end

data/syncano.gemspec

@@ -24,9 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '~> 0.9'
   spec.add_dependency 'activesupport', '>= 4.0'
   spec.add_dependency 'active_attr', '~> 0.8'
-  spec.add_dependency 'dirty_hashy', '~> 0.2'
-  spec.add_dependency 'celluloid'
-  spec.add_dependency 'celluloid-io'
-  spec.add_dependency 'mimetype-fu'
-  spec.add_dependency 'http', '= 0.7.4' # should work with no version constraint once 0.8.2 is released https://github.com/httprb/http.rb/issues/203#issuecomment-100299898
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syncano
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha4
+  version: 4.0.0.pre
 platform: ruby
 authors:
 - Piotr Zadrożny
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,76 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: dirty_hashy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mimetype-fu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
 description: A Ruby client that provides convenient interface for the Syncano api.
 email:
 - piotr.zadrozny@mindpower.pl
@@ -168,25 +98,28 @@ files:
 - README.md
 - Rakefile
 - circle.yml
+- lib/active_attr/dirty.rb
+- lib/active_attr/typecasting/hash_typecaster.rb
+- lib/active_attr/typecasting_override.rb
 - lib/syncano.rb
 - lib/syncano/api.rb
-- lib/syncano/api/endpoints.rb
 - lib/syncano/connection.rb
-- lib/syncano/poller.rb
+- lib/syncano/model/associations.rb
+- lib/syncano/model/associations/base.rb
+- lib/syncano/model/associations/belongs_to.rb
+- lib/syncano/model/associations/has_many.rb
+- lib/syncano/model/associations/has_one.rb
+- lib/syncano/model/base.rb
+- lib/syncano/model/callbacks.rb
+- lib/syncano/model/scope_builder.rb
 - lib/syncano/query_builder.rb
-- lib/syncano/resources.rb
 - lib/syncano/resources/base.rb
 - lib/syncano/resources/collection.rb
-- lib/syncano/resources/paths.rb
-- lib/syncano/resources/resource_invalid.rb
 - lib/syncano/resources/space.rb
-- lib/syncano/response.rb
 - lib/syncano/schema.rb
 - lib/syncano/schema/attribute_definition.rb
-- lib/syncano/schema/endpoints_whitelist.rb
 - lib/syncano/schema/resource_definition.rb
 - lib/syncano/scope.rb
-- lib/syncano/upload_io.rb
 - lib/syncano/version.rb
 - spec/integration/syncano_spec.rb
 - spec/spec_helper.rb
@@ -194,11 +127,8 @@ files:
 - spec/unit/connection_spec.rb
 - spec/unit/query_builder_spec.rb
 - spec/unit/resources/collection_spec.rb
-- spec/unit/resources/paths_spec.rb
 - spec/unit/resources/space_spec.rb
 - spec/unit/resources_base_spec.rb
-- spec/unit/response_spec.rb
-- spec/unit/schema/attribute_definition_spec.rb
 - spec/unit/schema/resource_definition_spec.rb
 - spec/unit/schema_spec.rb
 - spec/unit/syncano_spec.rb
@@ -223,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client library for Syncano 4.0
@@ -234,11 +164,8 @@ test_files:
 - spec/unit/connection_spec.rb
 - spec/unit/query_builder_spec.rb
 - spec/unit/resources/collection_spec.rb
-- spec/unit/resources/paths_spec.rb
 - spec/unit/resources/space_spec.rb
 - spec/unit/resources_base_spec.rb
-- spec/unit/response_spec.rb
-- spec/unit/schema/attribute_definition_spec.rb
 - spec/unit/schema/resource_definition_spec.rb
 - spec/unit/schema_spec.rb
 - spec/unit/syncano_spec.rb

data/lib/syncano/api/endpoints.rb

@@ -1,17 +0,0 @@
-module Syncano
-  class API
-    module Endpoints
-      def self.definition(resources_definition)
-        Module.new do
-          resources_definition.each do |resource_definition|
-            resource_class = ::Syncano::Resources.define_resource_class(resource_definition)
-
-            define_method(resource_definition.name.tableize) do
-              ::Syncano::QueryBuilder.new(connection, resource_class)
-            end if resource_definition.top_level?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/syncano/poller.rb

@@ -1,55 +0,0 @@
-module Syncano
-  class Poller
-    include Celluloid::IO
-
-    attr_accessor :connection, :method_name, :path, :responses
-
-
-    def initialize(connection, method_name, path)
-      self.connection = connection
-      self.method_name = method_name
-      self.path = path
-      self.responses = []
-    end
-
-    def poll
-      loop do
-        responses << http_fetcher.get(path)
-      end
-    end
-
-    def last_response
-      responses.last
-    end
-
-    private
-
-    def http_fetcher
-      HttpFetcher.new connection.api_key, connection.user_key
-    end
-
-    class HttpFetcher
-      attr_accessor :api_key, :user_key
-
-      def initialize(api_key, user_key)
-        self.api_key = api_key
-        self.user_key = user_key
-      end
-
-      def get(path, params = {})
-        url = Syncano::Connection.api_root + path
-
-        response = HTTP.
-          with_headers('X-API-KEY' => api_key,
-                       'X-USER-KEY' => user_key,
-                       'User-Agent' => "Syncano Ruby Gem #{Syncano::VERSION}").
-          get(url,
-              params: params,
-              ssl_socket_class: Celluloid::IO::SSLSocket,
-              socket_class: Celluloid::IO::TCPSocket)
-
-        response
-      end
-    end
-  end
-end

data/lib/syncano/resources.rb

@@ -1,158 +0,0 @@
-require 'dirty_hashy'
-
-module Syncano
-  module Resources
-    class << self
-      def build_definitions(schema_definition)
-        schema_definition.map do |name, raw_resource_definition|
-          ::Syncano::Schema::ResourceDefinition.new(name, raw_resource_definition)
-        end
-      end
-
-      def define_resource_class(resource_definition)
-        resource_class = new_resource_class(resource_definition)
-
-        const_set resource_definition.name, resource_class
-
-        if resource_definition[:collection]
-          resources_paths.collections.define resource_definition[:collection][:path], resource_class
-        end
-
-        if resource_definition[:member]
-          resources_paths.members.define resource_definition[:member][:path], resource_class
-        end
-
-        resource_class
-      end
-
-      def resources_paths
-        ::Syncano::Resources::Paths.instance
-      end
-
-      def new_resource_class(definition)
-        attributes_definitions = definition.attributes
-
-        ::Class.new(::Syncano::Resources::Base) do
-          self.create_writable_attributes = []
-          self.update_writable_attributes = []
-
-          attributes_definitions.each do |attribute_definition|
-
-            attribute attribute_definition.name,
-                      type: attribute_definition.type,
-                      default: attribute_definition.default
-
-            # TODO extract to a dynamically defined module
-            define_method("#{attribute_definition.name}=") do |new_value|
-              if new_value != read_attribute(attribute_definition.name)
-                send("#{attribute_definition.name}_will_change!")
-              end
-
-              super new_value
-            end
-
-            if attribute_definition.validate?
-              validates attribute_definition.name, presence: true
-            end
-
-            validates attribute_definition.name, length: attribute_definition.required_length
-
-            if inclusion = attribute_definition.required_values_inclusion
-              validates attribute_definition.name, inclusion: inclusion
-            end
-
-            self.create_writable_attributes << attribute_definition.name.to_sym if attribute_definition.writable?
-            self.update_writable_attributes << attribute_definition.name.to_sym if attribute_definition.updatable?
-          end
-
-
-          if definition.name == 'Object' #TODO: extract to a separate module + spec
-            def save(options = {})
-              options.assert_valid_keys :overwrite
-              overwrite = options[:overwrite] == true
-
-              if new_record? || !overwrite
-                super()
-              else
-                response = connection.request(:post, member_path, attributes)
-                initialize! response, true
-              end
-            end
-
-            def initialize!(_attributes = {}, _from_database = false)
-              to_return = super
-
-              custom_attributes.clean_up!
-
-              to_return
-            end
-
-            def select_changed_attributes
-              custom_attributes.changes.inject(super) do |changed, (key, (_was, is))|
-                changed[key] = is
-                changed
-              end
-            end
-
-            def attributes=(new_attributes)
-              super
-
-              self.custom_attributes = new_attributes.select { |k, v| !self.class.attributes.keys.include?(k) }
-            end
-
-            def attributes
-              super.merge custom_attributes
-            end
-
-            def changed
-              super + custom_attributes.changes.keys
-            end
-
-            def custom_attributes
-              @custom_attributes ||= DirtyHashy.new
-            end
-
-            def custom_attributes=(value)
-              @custom_attributes = value.is_a?(DirtyHashy) ?
-                value : DirtyHashy.new(value)
-            end
-
-            def method_missing(method_name, *args, &block)
-              if method_name.to_s =~ /=$/
-                custom_attributes[method_name.to_s.gsub(/=$/, '')] = args.first
-              else
-                if custom_attributes.has_key? method_name.to_s
-                  custom_attributes[method_name.to_s]
-                else
-                  super
-                end
-              end
-            end
-          end
-
-          (definition[:associations]['links'] || []).each do |association_schema|
-            case association_schema['type']
-              when 'list'
-                define_method(association_schema['name']) do
-                  has_many_association(association_schema['name'])
-                end
-              when 'run'
-                define_method(association_schema['name']) do |config = nil|
-                  custom_method association_schema['name'], config
-                end
-              when 'poll'
-                define_method(association_schema['name']) do |config = nil|
-                  async_method association_schema['name'], config
-                end
-            end
-          end
-
-          private
-
-          self.resource_definition = definition
-        end
-      end
-
-    end
-  end
-end