contentful_model 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8400d7ed706da1984ae22bff94c4c428ecb2b9e7
-  data.tar.gz: 5021acd89b16206ffecef168e3c389691018234b
+  metadata.gz: 038d352d42cc8f428379d27b2db70bccb7661244
+  data.tar.gz: 1b370619c14aecd9ee170ff0f82b72315a9cef7c
 SHA512:
-  metadata.gz: 0e3111eb0c5bf198a29bd349cc66cd8231fa2dd996b152a5666253e00d722a26d8c1ddd4b148100d2cfa050fb8fa453a5cead625f65445438af7002c6c5aa85a
-  data.tar.gz: fb553a246fd47575f8adbc4232dd23b5facf38b1f0d3affad9b86f1bc48e8bc7be36977f61f7a4470220605429d8f7fbaad786f72bf6e1e3ec8bafb153e8b682
+  metadata.gz: 0692c693706a5211fc011398e410dc79b70557cfd8f260950f56548a0136875da82f6d7aaf6cbecdf45f2a9f4d1e26419d7c0d24249db480b80d78ab004c6313
+  data.tar.gz: 3e20613dea10448a65e96a6f449389f6683dc967016ed26a9a0ba868247f8f90523709bbe5cffa6322da4cd7862d8871b9bfd38afdeaa2f1c1ff916d46565ce5

data/lib/contentful_model/associations/has_many_nested.rb

@@ -60,7 +60,7 @@ module ContentfulModel
           # 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
+            find_ancestors.to_a.last
           end
 
           # @return [Boolean] whether or not this instance has children

data/lib/contentful_model/base.rb

@@ -12,7 +12,13 @@ module ContentfulModel
     def method_missing(method, *args, &block)
       result = fields[:"#{method.to_s.camelize(:lower)}"]
       if result.nil?
-        raise ContentfulModel::AttributeNotFoundError, "no attribute #{method} found"
+        # if self.class.rescue_from_no_attribute_fields.member?()
+        # end
+        if self.class.return_nil_for_empty_attribute_fields && self.class.return_nil_for_empty_attribute_fields.include?(method)
+          return nil
+        else
+          raise ContentfulModel::AttributeNotFoundError, "no attribute #{method} found"
+        end
       else
         # if there's no coercion specified, return the result
         if self.class.coercions[method].nil?
@@ -56,7 +62,7 @@ module ContentfulModel
     alias_method :create, :save
 
     class << self
-      attr_accessor :content_type_id, :coercions
+      attr_accessor :content_type_id, :coercions, :return_nil_for_empty_attribute_fields
 
       def descendents
         ObjectSpace.each_object(Class).select { |klass| klass < self }
@@ -69,8 +75,14 @@ module ContentfulModel
       end
 
       def client
+        # add an entry mapping for this content type
         self.add_entry_mapping
-        @client ||= Contentful::Client.new(ContentfulModel.configuration.to_hash)
+        if ContentfulModel.use_preview_api
+          @preview_client ||= ContentfulModel::Client.new(ContentfulModel.configuration.to_hash)
+        else
+          @client ||= ContentfulModel::Client.new(ContentfulModel.configuration.to_hash)
+        end
+
       end
 
       def content_type
@@ -85,6 +97,22 @@ module ContentfulModel
         @coercions
       end
 
+      def return_nil_for_empty(*fields)
+        @return_nil_for_empty_attribute_fields ||= []
+
+        fields.each do |field|
+          define_method field do 
+            begin
+              super()
+            rescue ContentfulModel::AttributeNotFoundError
+              nil
+            end
+          end
+
+          @return_nil_for_empty_attribute_fields.push(field)
+        end
+      end
+
     end
 
 
@@ -93,4 +121,4 @@ module ContentfulModel
 
 
   end
-end
+end

data/lib/contentful_model/chainable_queries.rb

@@ -22,6 +22,11 @@ module ContentfulModel
         self
       end
 
+      def limit(n)
+        @query << {'limit' => n}
+        self
+      end
+
       def order(args)
         prefix = ''
         if args.is_a?(Hash)
@@ -32,7 +37,6 @@ module ContentfulModel
           prefix = ''
         end
         @query << {'order' => "#{prefix}fields.#{column.camelize(:lower)}"}
-        puts @query.inspect
         self
       end
 
@@ -43,8 +47,16 @@ module ContentfulModel
           #query is a hash
           if query.values.first.is_a?(Array) #we need to do an 'in' query
             @query << {"fields.#{query.keys.first.to_s.camelize(:lower)}[in]" => query.values.first.join(",")}
-          elsif query.values.first.is_a?(String)
+          elsif query.values.first.is_a?(String) || [TrueClass,FalseClass].member?(query.values.first.class)
             @query << {"fields.#{query.keys.first.to_s.camelize(:lower)}" => query.values.first}
+          elsif query.values.first.is_a?(Hash)
+            # if the search is a hash, use the key to specify the search field operator
+            # For example
+            # Model.search(start_date: {gte: DateTime.now}) => "fields.start_date[gte]" => DateTime.now
+            query.each do |field, condition|
+              search_predicate, search_value = *condition.flatten
+              @query << {"fields.#{field.to_s.camelize(:lower)}[#{search_predicate}]" => search_value}
+            end
           end
         end
         self
@@ -64,4 +76,4 @@ module ContentfulModel
     end
 
   end
-end
+end

data/lib/contentful_model/client.rb

@@ -0,0 +1,14 @@
+module ContentfulModel
+  class Client < Contentful::Client
+
+    PREVIEW_API_URL = "preview.contentful.com"
+
+    def initialize(configuration)
+      if ContentfulModel.use_preview_api
+        configuration[:api_url] = PREVIEW_API_URL
+        configuration[:access_token] = configuration[:preview_access_token]
+      end
+      super(configuration)
+    end
+  end
+end

data/lib/contentful_model/query.rb

@@ -3,7 +3,6 @@ module ContentfulModel
     attr_accessor :parameters
     def initialize(referenced_class, parameters=nil)
       @parameters = parameters || {}
-      @client = referenced_class.send(:client)
       @referenced_class = referenced_class
     end
 
@@ -17,7 +16,11 @@ module ContentfulModel
 
     def execute
       query = @parameters.merge!(default_parameters)
-      return @client.entries(query)
+      return client.send(:entries,query)
+    end
+
+    def client
+      @client ||= @referenced_class.send(:client)
     end
 
     def reset

data/lib/contentful_model/version.rb

@@ -1,3 +1,3 @@
 module ContentfulModel
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/contentful_model.rb

@@ -6,6 +6,9 @@ require "active_support/all"
 
 module ContentfulModel
   class << self
+    #accessor to set the preview API for use instead of the production one
+    attr_accessor :use_preview_api
+
     #access the configuration class as ContentfulModel.configuration
     attr_accessor :configuration
 
@@ -17,7 +20,10 @@ module ContentfulModel
   end
 
   class Configuration
-    attr_accessor :access_token, :space, :entry_mapping
+    attr_accessor :access_token,
+                  :preview_access_token,
+                  :space,
+                  :entry_mapping
 
     def initialize
       @entry_mapping ||= {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_model
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Error Creative Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful
@@ -85,6 +85,7 @@ files:
 - lib/contentful_model/associations/has_one.rb
 - lib/contentful_model/base.rb
 - lib/contentful_model/chainable_queries.rb
+- lib/contentful_model/client.rb
 - lib/contentful_model/errors.rb
 - lib/contentful_model/queries.rb
 - lib/contentful_model/query.rb