api_resource 0.4.3 → 0.5.0

data/spec/support/requests/association_requests.rb

@@ -2,23 +2,23 @@ HashDealer.define(:test_association_resource) do
   id{Kernel.rand(99999)}
   name{Faker::Name.first_name}
   age{Kernel.rand(99999)}
-  active(false)
+  is_active(false)
 end
 
 HashDealer.define(:active_test_association_resource, :parent => :test_association_resource) do
-  active(true)
+  is_active(true)
 end
 
 HashDealer.define(:active_birthday_test_association_resource, :parent => :active_test_association_resource) do
-  birthday{Date.today}
+  bday{Date.today}
 end
 
 HashDealer.define(:inactive_test_association_resource, :parent => :test_association_resource) do
-  active(false)
+  is_active(false)
 end
 
 HashDealer.define(:inactive_birthday_test_association_resource, :parent => :inactive_test_association_resource) do
-  birthday{Date.today}
+  bday{Date.today}
 end
 
 HashDealer.define(:has_one_object) do

data/spec/support/requests/test_resource_requests.rb

@@ -1,14 +1,25 @@
 HashDealer.define(:new_test_object) do
   attributes({
-    :protected => [:id],
+    :protected => [:id, :protected_attr],
     :public => [:name, :age, :is_active, [:bday, :date], [:roles, :array]]
   })
   scopes({
-    :active => {:active => :opt},
-    :paginate => {:per_page => :opt, :current_page => :opt}
+    :active => {},
+    :paginate => {
+      :per_page => :opt, 
+      :current_page => :opt
+    },
+    :birthday => {
+      :date => :req
+    }
   })
   associations({
-    :has_many => {:has_many_objects => {}},
+    :has_many => {
+      :has_many_objects => {},
+      :has_many_service_uri => {
+        :class_name => "HasManyObject"
+      }
+    },
     :belongs_to => {:belongs_to_object => {}, :custom_name => {:class_name => "BelongsToObject"}},
     :has_one => {:has_one_object => {}},
   })
@@ -28,6 +39,7 @@ end
 HashDealer.define(:test_resource_with_proxies, :parent => :test_resource) do
   has_one_object{HashDealer.roll(:has_one_object)}
   has_many_objects{(0..4).to_a.collect{HashDealer.roll(:has_many_object)}}
+  has_many_service_uri{[{:service_uri => "/test_resource/1/has_many"}]}
 end
 
 HashDealer.define(:test_resource_errors) do

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
 - Ethan Langevin
+- Dan Langevin
+- Brian Howald
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -413,53 +415,92 @@ dependencies:
         version: '0'
 description: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
-email: ejl6266@gmail.com
+email: developers@lifebooker.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
-- .travis.yml
+- api_resource.gemspec
+- coverage/assets/0.5.3/app.js
+- coverage/assets/0.5.3/fancybox/blank.gif
+- coverage/assets/0.5.3/fancybox/fancy_close.png
+- coverage/assets/0.5.3/fancybox/fancy_loading.png
+- coverage/assets/0.5.3/fancybox/fancy_nav_left.png
+- coverage/assets/0.5.3/fancybox/fancy_nav_right.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_e.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_n.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_ne.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_nw.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_s.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_se.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_sw.png
+- coverage/assets/0.5.3/fancybox/fancy_shadow_w.png
+- coverage/assets/0.5.3/fancybox/fancy_title_left.png
+- coverage/assets/0.5.3/fancybox/fancy_title_main.png
+- coverage/assets/0.5.3/fancybox/fancy_title_over.png
+- coverage/assets/0.5.3/fancybox/fancy_title_right.png
+- coverage/assets/0.5.3/fancybox/fancybox-x.png
+- coverage/assets/0.5.3/fancybox/fancybox-y.png
+- coverage/assets/0.5.3/fancybox/fancybox.png
+- coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.css
+- coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.pack.js
+- coverage/assets/0.5.3/favicon_green.png
+- coverage/assets/0.5.3/favicon_red.png
+- coverage/assets/0.5.3/favicon_yellow.png
+- coverage/assets/0.5.3/highlight.css
+- coverage/assets/0.5.3/highlight.pack.js
+- coverage/assets/0.5.3/jquery-1.6.2.min.js
+- coverage/assets/0.5.3/jquery.dataTables.min.js
+- coverage/assets/0.5.3/jquery.timeago.js
+- coverage/assets/0.5.3/jquery.url.js
+- coverage/assets/0.5.3/loading.gif
+- coverage/assets/0.5.3/magnify.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.5.3/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.5.3/smoothness/images/ui-icons_222222_256x240.png
+- coverage/assets/0.5.3/smoothness/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.5.3/smoothness/images/ui-icons_454545_256x240.png
+- coverage/assets/0.5.3/smoothness/images/ui-icons_888888_256x240.png
+- coverage/assets/0.5.3/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/assets/0.5.3/smoothness/jquery-ui-1.8.4.custom.css
+- coverage/assets/0.5.3/stylesheet.css
+- coverage/index.html
 - Gemfile
 - Gemfile.lock
 - Guardfile
-- LICENSE.txt
-- README.rdoc
-- Rakefile
-- VERSION
-- api_resource.gemspec
-- lib/api_resource.rb
 - lib/api_resource/association_activation.rb
-- lib/api_resource/associations.rb
-- lib/api_resource/associations/association_proxy.rb
+- lib/api_resource/associations/abstract_scope.rb
+- lib/api_resource/associations/association_scope.rb
 - lib/api_resource/associations/belongs_to_remote_object_proxy.rb
-- lib/api_resource/associations/dynamic_resource_scope.rb
-- lib/api_resource/associations/generic_scope.rb
 - lib/api_resource/associations/has_many_remote_object_proxy.rb
 - lib/api_resource/associations/has_many_through_remote_object_proxy.rb
 - lib/api_resource/associations/has_one_remote_object_proxy.rb
-- lib/api_resource/associations/multi_argument_resource_scope.rb
 - lib/api_resource/associations/multi_object_proxy.rb
 - lib/api_resource/associations/related_object_hash.rb
-- lib/api_resource/associations/relation_scope.rb
 - lib/api_resource/associations/resource_scope.rb
 - lib/api_resource/associations/scope.rb
 - lib/api_resource/associations/single_object_proxy.rb
+- lib/api_resource/associations.rb
 - lib/api_resource/attributes.rb
 - lib/api_resource/base.rb
 - lib/api_resource/callbacks.rb
 - lib/api_resource/connection.rb
 - lib/api_resource/core_extensions.rb
 - lib/api_resource/custom_methods.rb
-- lib/api_resource/decorators.rb
 - lib/api_resource/decorators/caching_decorator.rb
+- lib/api_resource/decorators.rb
 - lib/api_resource/exceptions.rb
-- lib/api_resource/formats.rb
 - lib/api_resource/formats/json_format.rb
 - lib/api_resource/formats/xml_format.rb
+- lib/api_resource/formats.rb
 - lib/api_resource/local.rb
 - lib/api_resource/log_subscriber.rb
 - lib/api_resource/mocks.rb
@@ -467,8 +508,13 @@ files:
 - lib/api_resource/observing.rb
 - lib/api_resource/railtie.rb
 - lib/api_resource/scopes.rb
+- lib/api_resource.rb
+- LICENSE.txt
 - nohup.out
+- Rakefile
+- README.rdoc
 - spec/lib/api_resource_spec.rb
+- spec/lib/associations/association_scope_spec.rb
 - spec/lib/associations_spec.rb
 - spec/lib/attributes_spec.rb
 - spec/lib/base_spec.rb
@@ -488,7 +534,9 @@ files:
 - spec/support/requests/prefix_model_requests.rb
 - spec/support/requests/test_resource_requests.rb
 - spec/support/test_resource.rb
+- spec/tmp/api_resource_test_db.sqlite
 - spec/tmp/DIR
+- VERSION
 homepage: http://github.com/ejlangev/resource
 licenses:
 - MIT
@@ -502,9 +550,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1111483963078583304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -519,3 +564,4 @@ specification_version: 3
 summary: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
 test_files: []
+has_rdoc: 

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1,5 +0,0 @@
---color
---format nested
---backtrace
---fail-fast
--X

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.2
-  - 1.9.3

data/lib/api_resource/associations/association_proxy.rb

@@ -1,121 +0,0 @@
-module ApiResource
-  
-  module Associations
-   
-    class AssociationProxy
-      
-      
-      cattr_accessor :remote_path_element; self.remote_path_element = :service_uri
-      cattr_accessor :include_class_scopes; self.include_class_scopes = true
-
-      attr_accessor :owner, :loaded, :klass, :internal_object, :remote_path, :scopes, :times_loaded
-
-      # TODO: added owner - moved it to the end because the tests don't use it - it's useful here though
-      def initialize(klass_name, contents, owner = nil)
-        raise "Cannot create an association proxy to the unknown object #{klass_name}" unless defined?(klass_name.to_s.classify)
-        # A simple attr_accessor for testing purposes
-        self.times_loaded = 0
-        self.owner = owner
-        self.klass = klass_name.to_s.classify.constantize
-        # make sure we have the remote definition
-        self.klass.load_class_data
-        self.load(contents)
-        self.loaded = {}.with_indifferent_access
-
-      #debugger
-
-        if self.class.include_class_scopes
-          self.scopes = self.scopes.reverse_merge(self.klass.scopes)
-        end
-        # Now that we have set up all the scopes with the load method we need to create methods
-        self.scopes.each do |key, _|
-          next if self.respond_to?(key)
-          self.instance_eval <<-EOE, __FILE__, __LINE__ + 1
-            def #{key}(opts = {})
-              @#{key} ||= ApiResource::Associations::RelationScope.new(self, :#{key}, opts)
-            end
-          EOE
-        end
-      end
-      
-      def serializable_hash(options = {})
-        raise "Not Implemented: This method must be implemented in a subclass"
-      end
-
-      def scopes
-        @scopes ||= {}.with_indifferent_access
-      end
-
-      def scope?(scp)
-        self.scopes.keys.include?(scp.to_s)
-      end
-
-      def internal_object
-        @internal_object ||= self.load_scope_with_options(:all, {})
-      end
-      
-      def blank?
-        self.internal_object.blank?
-      end
-      alias_method :empty?, :blank?
-
-      def method_missing(method, *args, &block)
-        self.internal_object.send(method, *args, &block)
-      end
-
-      def reload
-        if self
-          remove_instance_variable(:@internal_object) if instance_variable_defined?(:@internal_object)
-          self.load(self.load_from_remote({}))
-          self
-        end
-      end
-      
-      def to_s
-        self.internal_object.to_s
-      end
-      
-      def inspect
-        self.internal_object.inspect
-      end
-      
-      def ==(other)
-         raise "Not Implemented: This method must be implemented in a subclass"
-      end
-      
-      protected
-      # This method loads a particular scope with a set of options from the remote server
-      def load_scope_with_options(scope, options)
-        raise "Not Implemented: This method must be implemented in a subclass"
-      end
-      # This method is a helper to initialize for loading the data passed in to create this object
-      def load(contents)
-        raise "Not Implemented: This method must be implemented in a subclass"
-      end
-      
-      # get the remote URI based on our config and options
-      def build_load_path(options)
-        path = self.remote_path
-        # add a format if it doesn't exist and there is no query string yet
-        path += ".#{self.klass.format.extension}" unless path =~ /\./ || path =~/\?/
-        # add the query string, allowing for other user-provided options in the remote_path if we have options
-        unless options.blank?
-          path += (path =~ /\?/ ? "&" : "?") + options.to_query 
-        end
-        path
-      end
-
-      # get data from the remote server
-      def load_from_remote(options)
-        self.klass.connection.get(self.build_load_path(options))
-      end
-      # This method create the key for the loaded hash, it ensures that a unique set of scopes
-      # with a unique set of options is only loaded once
-      def loaded_hash_key(scope, options)
-        options.to_a.sort.inject(scope) {|accum,(k,v)| accum << "_#{k}_#{v}"}
-      end
-    end
-    
-  end
-  
-end

data/lib/api_resource/associations/dynamic_resource_scope.rb

@@ -1,23 +0,0 @@
-require 'api_resource/associations/resource_scope'
-
-module ApiResource
-  module Associations
-    class DynamicResourceScope < ResourceScope
-      
-      attr_accessor :dynamic_value
-      # initializer - set up the dynamic value
-      def initialize(klass, current_scope, dynamic_value, opts = {})
-        self.dynamic_value = dynamic_value
-        super(klass, current_scope, opts)
-      end
-      # get the to_query value for this resource scope
-      def to_hash
-        hsh = self.scopes[self.current_scope].clone
-        hsh.each_pair do |k,v|
-          hsh[k] = self.dynamic_value
-        end
-        self.parent_hash.merge(hsh)
-      end
-    end
-  end
-end

data/lib/api_resource/associations/generic_scope.rb

@@ -1,68 +0,0 @@
-require 'api_resource/associations/resource_scope'
-
-module ApiResource
-  module Associations
-
-    class GenericScope < ResourceScope
-      attr_reader :name
-      attr_reader :params
-      attr_reader :types
-      attr_reader :values
-
-      # Gets called when a scope is called.  Stores everything in
-      # this class.  Sorry, couldn't be bothered to figure out the 
-      # class hierarchy.
-      #
-      # klass - ApiResourceBase class
-      # current_scope - sym for the scope
-      # *args - arguments being passed to the scope
-      def initialize(klass, current_scope, *args)
-
-        @name = current_scope # contains sym with scope ie :for_provider
-        @params = klass.related_objects[:scopes][current_scope].keys
-        @types = klass.related_objects[:scopes][current_scope].values
-
-        # Bail if we have crap
-        if @params == nil
-          raise "Scope #{@name} does not exist #{klass.name}.  Scopes: #{klass.related_objects[:scopes]}" 
-        end
-
-        # extract parent scope stuff
-        opts = {}
-        last_arg = args[args.count - 1]
-        if last_arg != nil && last_arg.is_a?(Hash) && last_arg[:parent] != nil
-          args = args.slice(0, args.count - 1)
-          opts = last_arg
-        end
-
-        # walk through parameters and types and assign values from *args to parameters
-        @values = []
-        @params.count.times do |i|
-          if @types[i] == :rest
-            @values << args.slice(i, args.count)
-          else
-            @values << args[i]
-          end
-        end
-
-        # Let the parent class do its magic.
-        super(klass, current_scope, opts)
-      end
-
-      # get the to_query value for this resource scope
-      def to_hash
-        # debugger
-        if @params.count == 0
-          scope_arguments = true 
-        else 
-          scope_arguments = {}
-          @params.count.times do |i|
-            scope_arguments[@params[i]] = @values[i] if @values[i] != nil
-          end
-        end
-        self.parent_hash.merge({@name => scope_arguments})
-      end
-    end
-  end
-end
-

data/lib/api_resource/associations/multi_argument_resource_scope.rb

@@ -1,15 +0,0 @@
-require 'api_resource/associations/dynamic_resource_scope'
-
-module ApiResource
-  module Associations
-    class MultiArgumentResourceScope < DynamicResourceScope
-      # initialize with a variable number of dynamic arguments
-      def initialize(klass, current_scope, *dynamic_value)
-        # pull off opts
-        opts = dynamic_value.extract_options!
-        # we always dynamic value to be an Array, so we don't use the splat here
-        super(klass, current_scope, dynamic_value.flatten, opts)
-      end
-    end
-  end
-end

data/lib/api_resource/associations/relation_scope.rb

@@ -1,25 +0,0 @@
-require 'api_resource/associations/scope'
-
-module ApiResource
-  
-  module Associations
-    
-    class RelationScope < Scope
-
-      # Use this method to access the internal data, this guarantees that loading only occurs once per object
-      def internal_object
-        ApiResource.with_ttl(ttl) do
-          @internal_object ||= self.klass.send(:load_scope_with_options, self.current_scope, self.to_hash)
-        end
-      end
-      # 
-      # class factory
-      def self.class_factory(hsh)
-        ApiResource::Associations::RelationScope
-      end
-
-    end
-    
-  end
-  
-end