contentful_model 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199e61fb05a5d359cbf69b01d5db2dba308239a9
-  data.tar.gz: b9478b41fda3f6b2870d54a9f627d44a9662c0ce
+  metadata.gz: 209fd18d71e5f92e2e101d42dbc12c2a1028c841
+  data.tar.gz: 16b9e1322d5102c7be988ca982f99f32e3ff0dc1
 SHA512:
-  metadata.gz: 8801e3881b967c5cf1e44918cb605a58ded0fc33e1247018aa718c934c491159f3f8b2b6ad33931e5ac3b329ba63351a7caf94a786eeec6548910f0d0364ec0f
-  data.tar.gz: 20e98e13891d9b9b33c0b50e192b5b9ddef673e522f631b90f53f279b4f424cda334f220af2a2a9b7068bc6a39dca2f3d2714f7ab11f17d8cdd75b8603f356a9
+  metadata.gz: 64ae64418a0f5b3d9687e2c4446de39ac92002d87b3eec38b0a6aeeb709f8b5f1eb49ee39b1fd1759fe403e29e5f86281e779023c21abcc5e1a81aa95e9ba2bb
+  data.tar.gz: adecfdeaabf91259bd92ea9225d58e35db73e3da88d0be1706078b6cea9fa886f5b3cb81b13545d5e20b8935c704e24950f6d92ea0fd8112949d3dacad4b3c0a

data/lib/contentful_model/associations/associations.rb

@@ -8,6 +8,7 @@ module ContentfulModel
       base.include HasOne
       base.include BelongsTo
       base.include BelongsToMany
+      base.include HasManyNested
     end
   end
 end

data/lib/contentful_model/associations/has_many_nested.rb

@@ -0,0 +1,76 @@
+module ContentfulModel
+  module Associations
+    module HasManyNested
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        # has_many_nested allows you to set up a tree relationship
+        # it calls has_many and belongs_to_many on the class, and sets up
+        # some methods to find a deeply-nested instance's parents
+        #
+        # To set this up in contentful, add a multi-entry field validated to the same model
+        # as the parent, and give it a name. For example, Page might have a field called childPages:
+        #
+        # has_many_nested :child_pages
+        #
+        # would setup up an instance attribute called parent_pages which lists all the direct
+        # parents of this page. It would also create methods to find a page based on an array
+        # of its ancestors, and generate an array of ancestors. Note that this builds an array of the
+        # ancestors which called the object; because 'many' associations in Contentful are actually
+        # 'belongs_to_many' from the child end, we might have several ancestors to a page. You will need
+        # to write your own recursion for this, because it's probably an implementation-specific problem.
+        def has_many_nested(association_name)
+          has_many association_name, inverse_of: :"parent_#{self.to_s.underscore}"
+          belongs_to_many :"parent_#{self.to_s.underscore.pluralize}", class_name: self.to_s, inverse_of: association_name
+
+          # A utility method which returns the parent object; saves passing around interpolated strings
+          define_method :parent do
+            self.send(:"parent_#{self.class.to_s.underscore}")
+          end
+
+          # Determine if the object has any parents. If it doesn't, it's considered a root.
+          # This only works if the objects are called through their parents' 'child_[whatever]' method
+          define_method :root? do
+            parent.nil?
+          end
+
+          # Iterate over parents until you reach the root.
+          # @param [Proc] a block to call on each ancestor
+          # @return [Enumerable] which you can iterate over
+          define_method :find_ancestors do |&block|
+            return enum_for(:find_ancestors) unless block
+            block.call(parent)
+            unless parent.root?
+              parent.find_ancestors {|a| block.call(a)}
+            end
+          end
+
+          # A utility method to return the results of `find_ancestors` as an array
+          # @return [Array] of ancestors in reverse order (root last)
+          define_method :ancestors do
+            self.find_ancestors.to_a
+          end
+
+          # Return the last member of the enumerable, which is the root
+          # @return the root instance of this object
+          define_method :root do
+            find_ancestors.last
+          end
+
+          # @return [Boolean] whether or not this instance has children
+          define_method :has_children? do
+            !self.send(association_name).empty?
+          end
+
+          # @return [Array] a collection of child objects, based on the association name
+          define_method :children do
+            self.send(association_name)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/contentful_model/base.rb

@@ -70,7 +70,7 @@ module ContentfulModel
 
       def client
         self.add_entry_mapping
-        @@client ||= Contentful::Client.new(ContentfulModel.configuration.to_hash)
+        @client ||= Contentful::Client.new(ContentfulModel.configuration.to_hash)
       end
 
       def content_type

data/lib/contentful_model/chainable_queries.rb

@@ -42,9 +42,9 @@ module ContentfulModel
         args.each do |query|
           #query is a hash
           if query.values.first.is_a?(Array) #we need to do an 'in' query
-            @query << {"fields.#{query.keys.first}[in]" => query.values.first.join(",")}
+            @query << {"fields.#{query.keys.first.to_s.camelize(:lower)}[in]" => query.values.first.join(",")}
           elsif query.values.first.is_a?(String)
-            @query << {"fields.#{query.keys.first}" => query.values.first}
+            @query << {"fields.#{query.keys.first.to_s.camelize(:lower)}" => query.values.first}
           end
         end
         self
@@ -53,7 +53,7 @@ module ContentfulModel
       def search(parameters)
         if parameters.is_a?(Hash)
           parameters.each do |field, search|
-            @query << {"fields.#{field}[match]" => search}
+            @query << {"fields.#{field.to_s.camelize(:lower)}[match]" => search}
           end
         elsif parameters.is_a?(String)
           @query << {"query" => parameters}

data/lib/contentful_model/version.rb

@@ -1,3 +1,3 @@
 module ContentfulModel
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Error Creative Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful
@@ -81,6 +81,7 @@ files:
 - lib/contentful_model/associations/belongs_to.rb
 - lib/contentful_model/associations/belongs_to_many.rb
 - lib/contentful_model/associations/has_many.rb
+- lib/contentful_model/associations/has_many_nested.rb
 - lib/contentful_model/associations/has_one.rb
 - lib/contentful_model/base.rb
 - lib/contentful_model/chainable_queries.rb