smooth_operator 1.3.0 → 1.8.0

data/spec/support/models/user_with_address_and_posts.rb

@@ -1,8 +1,6 @@
 module UserWithAddressAndPosts
-
-  class Father < User::Base
-
-    options resource_name: 'user'
+  
+  class Father < User
 
     schema(
       posts: Post,
@@ -13,33 +11,27 @@ module UserWithAddressAndPosts
 
   class Son < Father
 
+    self.table_name = 'users'
+
     schema(
       age: :int,
       dob: :date,
-      price: :float,
-      manager: :bool,
-      date: :datetime,
-      complex_field: nil,
-      first_name: :string
+      manager: :bool
     )
 
   end
 
-  class SoftBehaviour < Son
-
-    options strict_behaviour: false
-
-  end
-
   class WithPatch < Son
 
-    options update_http_verb: 'patch'
+    self.table_name = 'users'
 
-  end
+    self.save_http_verb = :patch
 
+  end
+  
 
   module UserBlackListed
-
+    
     class Father < ::UserWithAddressAndPosts::Son
 
       attributes_black_list_add "last_name"
@@ -55,7 +47,7 @@ module UserWithAddressAndPosts
   end
 
   module UserWhiteListed
-
+    
     class Father < ::UserWithAddressAndPosts::Son
 
       attributes_white_list_add "id"
@@ -69,7 +61,7 @@ module UserWithAddressAndPosts
     end
 
   end
-
+  
   class UserWithMyMethod < UserWithAddressAndPosts::Son
 
     def my_method

data/spec/support/test_server.rb

@@ -1,6 +1,5 @@
 require 'sinatra/base'
 require 'sinatra/json'
-require 'pry'
 
 class TestServer < Sinatra::Base
 
@@ -8,17 +7,6 @@ class TestServer < Sinatra::Base
     username == 'admin' and password == 'admin'
   end
 
-  get '/posts/:id' do
-    post_data = { id: 1, body: 'from_resource_url' }
-    json post_data
-  end
-
-  get '/users/:id/posts/:id' do
-    post_data = { id: 1, body: 'from_nested_url' }
-    json post_data
-  end
-
-
   get '/users/test_hash_with_array' do
     status test_hash_with_array
   end
@@ -37,70 +25,27 @@ class TestServer < Sinatra::Base
 
 
   get '/users' do
-    users = [FactoryGirl.attributes_for(:user_with_address_and_posts), FactoryGirl.attributes_for(:user_with_address_and_posts)]
-
-    users[0][:id] = 1
-    users[1][:id] = 2
-
-    json users
-  end
-
-  get '/users/array_with_nested_users' do
-    nested_users = [{ id: 1, first_name: '1' }, { id: 2, first_name: '2' }]
-
-    users = [{ id: 1, users: nested_users}, { id: 2, users: nested_users}]
-
-    json users
-  end
-
-  get '/users/misc_array' do
-    json [FactoryGirl.attributes_for(:user_with_address_and_posts), 2]
+    json [{ id: 1 }, { id: 2 }]
   end
 
   get '/users/with_metadata' do
-    nested_users = [{ id: 1, first_name: '1' }, { id: 2, first_name: '2' }]
-
-    users = [{ id: 1, users: nested_users}, { id: 2, users: nested_users}]
-
-    data = { page: 1, total: 6, users: users }
-
+    data = { page: 1, total: 6, users: [{ id: 1 }, { id: 2 }] }
     json data
   end
-
-  get '/users/bad_json' do
-    'ok'
-  end
-
+  
   get '/users/:id' do
     json FactoryGirl.attributes_for(:user_with_address_and_posts)
   end
 
-  get '/users/:id/with_metadata' do
-    user_data = { user: FactoryGirl.attributes_for(:user_with_address_and_posts), status: 1 }
-    json user_data
-  end
-
-
-  put '/users/:id/send_error' do
-    data_with_error = { id: 1, errors: [{ first_name: ["can't be blank"] }] }
-    json data_with_error
-  end
-
 
   post '/users' do
     common_response
   end
 
-  post '/users/timeout' do
-    # sleep 2 # for typhoeus tests
-    sleep 1
-    json 'ok'
-  end
-
   put '/users/:id' do
     common_response
   end
-
+  
   patch '/users/:id' do
     common_response
   end
@@ -110,7 +55,7 @@ class TestServer < Sinatra::Base
   end
 
   not_found do
-    # binding.pry
+    binding.pry
   end
 
 
@@ -123,7 +68,7 @@ class TestServer < Sinatra::Base
     data.delete('id')
 
     query_params = (params[:query_string_param] == 'true')
-
+    
     internal_data_match = params[:user] ? (params[:user] == data) : true
 
     json({ user: { server_response: true }, http_verb: env["REQUEST_METHOD"].downcase, internal_data_match: internal_data_match, query_params: query_params })
@@ -157,8 +102,7 @@ class TestServer < Sinatra::Base
   end
 
   if app_file == $0
-    # require './spec/spec_helper' unless defined? SmoothOperator
-    # require './spec/require_helper' unless defined? SmoothOperator
+    require './spec/spec_helper' unless defined? SmoothOperator
     run!
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.8.0
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,44 +28,30 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.9.0.rc5
 description: ActiveResource alternative
 email:
 - goncalves.joao@gmail.com
@@ -82,53 +68,34 @@ files:
 - console.rb
 - lib/smooth_operator.rb
 - lib/smooth_operator/array_with_meta_data.rb
-- lib/smooth_operator/associations.rb
-- lib/smooth_operator/associations/association_reflection.rb
-- lib/smooth_operator/associations/has_many_relation.rb
-- lib/smooth_operator/associations/reflection.rb
 - lib/smooth_operator/attribute_assignment.rb
-- lib/smooth_operator/cookie_jar.rb
 - lib/smooth_operator/delegation.rb
 - lib/smooth_operator/finder_methods.rb
 - lib/smooth_operator/helpers.rb
-- lib/smooth_operator/http_methods.rb
-- lib/smooth_operator/internal_data.rb
+- lib/smooth_operator/internal_attribute.rb
+- lib/smooth_operator/model_schema.rb
 - lib/smooth_operator/open_struct.rb
 - lib/smooth_operator/operator.rb
-- lib/smooth_operator/operators/connection_wrapper.rb
-- lib/smooth_operator/operators/faraday.rb
-- lib/smooth_operator/operators/typhoeus.rb
-- lib/smooth_operator/options.rb
 - lib/smooth_operator/persistence.rb
-- lib/smooth_operator/remote_call/base.rb
-- lib/smooth_operator/remote_call/errors/connection_failed.rb
-- lib/smooth_operator/remote_call/errors/timeout.rb
-- lib/smooth_operator/remote_call/faraday.rb
-- lib/smooth_operator/remote_call/typhoeus.rb
-- lib/smooth_operator/resource_name.rb
-- lib/smooth_operator/schema.rb
+- lib/smooth_operator/remote_call.rb
 - lib/smooth_operator/serialization.rb
 - lib/smooth_operator/translation.rb
-- lib/smooth_operator/type_casting.rb
+- lib/smooth_operator/type_converter.rb
 - lib/smooth_operator/validations.rb
 - lib/smooth_operator/version.rb
 - smooth_operator.gemspec
 - spec/factories/user_factory.rb
-- spec/require_helper.rb
 - spec/smooth_operator/attribute_assignment_spec.rb
 - spec/smooth_operator/delegation_spec.rb
 - spec/smooth_operator/finder_methods_spec.rb
+- spec/smooth_operator/model_schema_spec.rb
 - spec/smooth_operator/operator_spec.rb
 - spec/smooth_operator/persistence_spec.rb
-- spec/smooth_operator/remote_call_spec.rb
-- spec/smooth_operator/resource_name_spec.rb
 - spec/smooth_operator/serialization_spec.rb
-- spec/smooth_operator/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/persistence_helper.rb
 - spec/support/localhost_server.rb
 - spec/support/models/address.rb
-- spec/support/models/comment.rb
 - spec/support/models/post.rb
 - spec/support/models/user.rb
 - spec/support/models/user_with_address_and_posts.rb
@@ -153,28 +120,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Simple and fully customizable alternative to ActiveResource, using faraday
-  gem to stablish remote calls"
+  gem to stablish parallel remote calls"
 test_files:
 - spec/factories/user_factory.rb
-- spec/require_helper.rb
 - spec/smooth_operator/attribute_assignment_spec.rb
 - spec/smooth_operator/delegation_spec.rb
 - spec/smooth_operator/finder_methods_spec.rb
+- spec/smooth_operator/model_schema_spec.rb
 - spec/smooth_operator/operator_spec.rb
 - spec/smooth_operator/persistence_spec.rb
-- spec/smooth_operator/remote_call_spec.rb
-- spec/smooth_operator/resource_name_spec.rb
 - spec/smooth_operator/serialization_spec.rb
-- spec/smooth_operator/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/persistence_helper.rb
 - spec/support/localhost_server.rb
 - spec/support/models/address.rb
-- spec/support/models/comment.rb
 - spec/support/models/post.rb
 - spec/support/models/user.rb
 - spec/support/models/user_with_address_and_posts.rb

data/lib/smooth_operator/associations.rb

@@ -1,110 +0,0 @@
-require "smooth_operator/associations/has_many_relation"
-require "smooth_operator/associations/association_reflection"
-
-module SmoothOperator
-  module Associations
-
-    def has_many(association, options = {})
-      accepts_nested_objects(association, :has_many, options)
-    end
-
-    def has_one(association, options = {})
-      accepts_nested_objects(association, :has_one, options)
-    end
-
-    def belongs_to(association, options = {})
-      accepts_nested_objects(association, :belongs_to, options)
-    end
-
-    def reflections
-      Helpers.get_instance_variable(self, :reflections, {})
-    end
-
-    def reflect_on_association(association)
-      reflections[association]
-    end
-
-    def reflect_on_all_associations(macro = nil)
-      macro ? reflections.values.select { |reflection| reflection.macro == macro } : reflections.values
-    end
-
-    def rails_serialization
-      get_option :rails_serialization, false
-    end
-
-    protected ###################### PROTECTED ###################
-
-    # TODO: THIS MUST GO TO A HELPER_METHODS MODULE
-
-    def accepts_nested_objects(association, macro, options = {})
-      options = parse_options(options, { macro: macro })
-
-      reflection = AssociationReflection.new(association, Reflection.new(name, {}), options)
-
-      schema(association => reflection.klass)
-
-      reflections.merge!(association => reflection)
-
-      if reflection.has_many?
-        define_has_many_association_method(reflection, association)
-      else
-        define_single_association_method(reflection, association)
-      end
-
-      self.send(:attr_reader, "#{association}_attributes".to_sym)
-
-      define_attributes_setter_methods(reflection, association)
-    end
-
-    private ####################### PRIVATE ######################
-
-    def define_has_many_association_method(reflection, association)
-      define_method(association) do
-        has_many_relation = instance_variable_get("@#{association}")
-
-        if has_many_relation.nil?
-          has_many_relation = HasManyRelation.new(self, association)
-
-          instance_variable_set("@#{association}", has_many_relation)
-        end
-
-        has_many_relation.send(:refresh)
-
-        has_many_relation
-      end
-    end
-
-    def define_single_association_method(reflection, association)
-      define_method(association) { internal_data_get(association.to_s) }
-
-      define_method("build_#{association}") do |attributes = {}|
-        new_instance = reflection.klass.new(attributes)
-
-        internal_data_push(association, new_instance)
-
-        new_instance
-      end
-    end
-
-    def define_attributes_setter_methods(reflection, association)
-      define_method("#{association}_attributes=") do |attributes|
-        instance_variable_set("@#{association}_attributes", attributes)
-
-        attributes = attributes.values if reflection.has_many?
-
-        internal_data_push(association.to_s, attributes)
-      end
-    end
-
-    def parse_options(options, default_options)
-      options = options.is_a?(Hash) ? options.merge(default_options) : default_options
-
-      if options[:rails_serialization].nil?
-        options[:rails_serialization] = rails_serialization
-      end
-
-      Helpers.symbolyze_keys(options)
-    end
-
-  end
-end