kelredd-resourceful 0.5.11 → 0.6.1

data/lib/resourceful/model/base.rb

@@ -16,7 +16,10 @@ module Resourceful
         block = opts.delete(:on_response)
         (yield set_agent.get(path, opts, &block)).collect{|data| new(data)}
       end
-
+      def self.find(id, opts, force)
+        raise NotImplementedError, "no find method has been defined"
+      end
+      
       def initialize(data)
       end
       
@@ -66,7 +69,7 @@ module Resourceful
       end
       
       def self.attribute(name, type, config={})
-        clean_name = name.to_s.gsub(/\W/,'')
+        clean_name = cleanup_name(name)
         add_to_attributes(name.to_s)
         config ||= {}
         config[:path] ||= clean_name
@@ -102,61 +105,8 @@ module Resourceful
         end
       end
 
-      def self.has_one(name, config={})
-        clean_name = name.to_s.gsub(/\W/,'')
-        config ||= {}
-        config[:path] ||= clean_name
-        define_method(name) do
-          instance_variable_get("@#{clean_name}") || \
-            instance_variable_set("@#{clean_name}", \
-              if (c = child(config))
-                config[:klass].constantize.new(c) rescue c
-              else
-                c
-              end
-            )
-        end
-      end
-
-      def self.has_many(name, config={})
-        clean_name = name.to_s.gsub(/\W/,'')
-        config ||= {}
-        config[:path] ||= clean_name
-        define_method(name) do
-          instance_variable_get("@#{clean_name}") || \
-            instance_variable_set("@#{clean_name}", \
-              if ((c = child(config)) && c.respond_to?(:collect))
-                c.collect do |item|
-                  config[:klass].constantize.new(item) rescue item
-                end
-              else
-                c
-              end
-            )
-        end
-      end
-
-      def self.belongs_to(name, config={})
-        clean_name = name.to_s.gsub(/\W/,'')
-        config ||= {}
-        config[:id] ||= "#{clean_name}_id"
-        define_method(name) do
-          instance_variable_get("@#{clean_name}") || \
-            instance_variable_set("@#{clean_name}", \
-              if ((k = config[:klass].constantize) && k.respond_to?(:find))
-                if self.respond_to?(config[:id]) && \
-                   (bt_id = self.send(config[:id])) && \
-                   !bt_id.nil? && \
-                   !bt_id.empty?
-                  k.find(bt_id)
-                else
-                  nil
-                end
-              else
-                nil
-              end
-            )
-        end
+      def self.cleanup_name(name)
+        name.to_s.gsub(/\W/,'')
       end
       
       private

data/lib/resourceful/model/embedded_associations.rb

@@ -0,0 +1,55 @@
+module Resourceful
+  module Model
+    module EmbeddedAssociations
+      
+      module ClassMethods
+
+        protected
+        
+        def contains_one(name, config={})
+          clean_name = cleanup_name(name)
+          config ||= {}
+          config[:path] ||= clean_name
+          define_method(name) do
+            instance_variable_get("@#{clean_name}") || \
+              instance_variable_set("@#{clean_name}", \
+                if (c = child(config))
+                  config[:class].constantize.new(c) rescue c
+                else
+                  c
+                end
+              )
+          end
+        end
+
+        def contains_many(name, config={})
+          clean_name = cleanup_name(name)
+          config ||= {}
+          config[:path] ||= clean_name
+          define_method(name) do
+            instance_variable_get("@#{clean_name}") || \
+              instance_variable_set("@#{clean_name}", \
+                if ((c = child(config)) && c.respond_to?(:collect))
+                  c.collect do |item|
+                    config[:class].constantize.new(item) rescue item
+                  end
+                else
+                  c
+                end
+              )
+          end
+        end
+
+      end
+      
+      module InstanceMethods
+      end
+      
+      def self.included(receiver)
+        receiver.extend         ClassMethods
+        receiver.send :include, InstanceMethods
+      end
+      
+    end
+  end
+end

data/lib/resourceful/model/external_associations.rb

@@ -0,0 +1,68 @@
+module Resourceful
+  module Model
+    module ExternalAssociations
+      
+      module ClassMethods
+
+        protected
+        
+        def has_one(name, config={})
+          has_many(name, config).first
+        end
+
+        def has_many(name, config={})
+          clean_name = cleanup_name(name)
+          config ||= {}
+          raise ArgumentError, "has_many requires a :class option to be specified" unless config[:class]
+          klass = config.delete(:class)
+          force = config.delete(:force) || true
+          define_method(name) do
+            unless klass.to_s.constantize.respond_to?(:find)
+              raise NotImplementedError, "has_many expects #{klass} to be findable (ie mixin the Findable helper)"
+            end
+            instance_variable_get("@#{clean_name}") || \
+              instance_variable_set("@#{clean_name}", \
+                klass.to_s.constantize.find(:all, config, force)
+              )
+          end
+        end
+
+        def belongs_to(name, config={})
+          clean_name = cleanup_name(name)
+          config ||= {}
+          raise ArgumentError, "has_many requires a :class option to be specified" unless config[:class]
+          klass = config.delete(:class)
+          foreign_key = config.delete(:foreign_key) || "#{clean_name}_id"
+          force = config.delete(:force) || true
+          define_method(name) do
+            unless self.respond_to?(foreign_key)
+              raise ArgumentError, "belongs_to requires a '#{foreign_key}' method defined to return the foreign_key"
+            end
+            unless klass.to_s.constantize.respond_to?(:find)
+              raise NotImplementedError, "has_many expects #{klass} to be findable (ie mixin the Findable helper)"
+            end
+            fk = self.send(foreign_key)
+            if fk.nil? || fk.empty?
+              nil
+            else
+              instance_variable_get("@#{clean_name}") || \
+                instance_variable_set("@#{clean_name}", \
+                  klass.to_s.constantize.find(fk, config, force)
+                )
+            end
+          end
+        end
+
+      end
+      
+      module InstanceMethods
+      end
+      
+      def self.included(receiver)
+        receiver.extend         ClassMethods
+        receiver.send :include, InstanceMethods
+      end
+      
+    end
+  end
+end

data/lib/resourceful/model/findable.rb

@@ -0,0 +1,44 @@
+module Resourceful
+  module Model
+    module Findable
+      
+      module ClassMethods
+
+        def find(id, opts={}, force=true)
+          opts ||= {}
+          opts = findable_default_opts.merge(opts) if respond_to?(:findable_default_opts)
+          case id
+          when :all
+            self.get_collection("#{findable_index}.#{format}", opts, force)
+          when :first
+            self.get_collection("#{findable_index}.#{format}", opts, force).first
+          else
+            self.get("#{findable_index}/#{id}.#{format}", opts, force)
+          end
+        end
+        
+        def all
+          find(:all)
+        end
+        def first
+          find(:first)
+        end
+        
+        def findable_index
+          raise NotImplementedError, "Findable expects a public class method 'findable_index'"
+        end
+        
+      end
+      
+      module InstanceMethods
+        
+      end
+      
+      def self.included(receiver)
+        receiver.extend         ClassMethods
+        receiver.send :include, InstanceMethods
+      end
+      
+    end
+  end
+end

data/lib/resourceful/model/json.rb

@@ -35,6 +35,10 @@ module Resourceful
       
       protected
       
+      def self.format
+        Resourceful::Resource::Json.to_s
+      end
+      
       def attribute(config)
         begin
           get_node(config[:path])
@@ -54,6 +58,7 @@ module Resourceful
       def get_node(path_config)
         self.class.get_node(@data, path_config)
       end
+
     end
 
   end

data/lib/resourceful/model/xml.rb

@@ -35,6 +35,10 @@ module Resourceful
       
       protected
       
+      def self.format
+        Resourceful::Resource::Xml.to_s
+      end
+      
       def attribute(config)
         begin
           get_node(config[:path]).first.send((config[:content] || 'content').to_s)

data/lib/resourceful/version.rb

@@ -2,8 +2,8 @@ module Resourceful
   module Version
     
     MAJOR = 0
-    MINOR = 5
-    TINY  = 11
+    MINOR = 6
+    TINY  = 1
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.5.11
+  version: 0.6.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,9 @@ files:
 - lib/resourceful/extensions.rb
 - lib/resourceful/model
 - lib/resourceful/model/base.rb
+- lib/resourceful/model/embedded_associations.rb
+- lib/resourceful/model/external_associations.rb
+- lib/resourceful/model/findable.rb
 - lib/resourceful/model/json.rb
 - lib/resourceful/model/xml.rb
 - lib/resourceful/model.rb