contentful_model 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd49f9a5ab20693fb5a3b33e2fa6060c26d748a
-  data.tar.gz: bfc894e3c1ecffe1b55b3bd70a6a61e65f46adf2
+  metadata.gz: f655ef4ae60fcc26f4d88f3eedb7709f59489da5
+  data.tar.gz: 2e04d8f9ba67f17737ae0a63d72c91667ce910c4
 SHA512:
-  metadata.gz: dc6c95c19d7fda48f82dbdfd5d4f701d689017bb5a47b992a5122132fcb114cfb933056ce287a75ce78d169e21f22075c9bbbd8341800a8f3da628578f83cf31
-  data.tar.gz: cdfa041cca206a8906469118311070fce55279290b001a26cd9293426c20ff0365b0e2d3615bee313d0f059e69f321f9f2414226d6c8818db5bc8a296e0d0778
+  metadata.gz: 3b1ea89fbd1f4accb2969d8a7382ffee88a29ed49004cc975da2aafa2f1ccd369e583cd95be2528e460fd43a6e8368edb8c3e036b5555062df04977582d8b29a
+  data.tar.gz: 0ef31f85d865ba031f454099ef2ab8aaccac6e388d7aa0ba16b72008ad945021c767515400fc3f2cd9bda1426f5210d5969bd9942e5e465fb1c6ac152e43a393

data/lib/contentful_model/chainable_queries.rb

@@ -1,32 +1,23 @@
 module ContentfulModel
   module ChainableQueries
     def self.included(base)
+      base.include ContentfulModel::Queries
       base.extend ClassMethods
-      base.class_eval do
-        cattr_accessor :query
-      end
     end
 
     module ClassMethods
-      def get_query
-        @query ||= ContentfulModel::Query.new(self)
-      end
 
       def all
-        get_query
         raise ArgumentError, "You need to set self.content_type in your model class" if @content_type_id.nil?
         self
       end
 
       def first
-        get_query
         @query << {'limit' => 1}
-        @query.execute.first
+        load.first
       end
 
       def offset(n)
-        get_query
-        puts @query.inspect
         @query << {'skip' => n}
         self
       end
@@ -34,12 +25,11 @@ module ContentfulModel
       alias_method :skip, :offset
 
       def find_by(*args)
-        get_query
         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(",")}
-          else
+          elsif query.values.first.is_a?(String)
             @query << {"fields.#{query.keys.first}" => query.values.first}
           end
         end
@@ -47,7 +37,6 @@ module ContentfulModel
       end
 
       def search(parameters)
-        get_query
         if parameters.is_a?(Hash)
           parameters.each do |field, search|
             @query << {"fields.#{field}[match]" => search}
@@ -58,16 +47,6 @@ module ContentfulModel
         self
       end
 
-      def load
-        @query.execute
-      end
-
-      def find(id)
-        get_query
-        @query << {'sys.id' => id}
-        @query.execute.first
-      end
-
     end
 
   end

data/lib/contentful_model/queries.rb

@@ -0,0 +1,30 @@
+module ContentfulModel
+  module Queries
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+
+      def inherited(subclass)
+        instanciate_query(subclass)
+      end
+
+      def instanciate_query(klass)
+        klass.instance_variable_set(:"@query",ContentfulModel::Query.new(klass))
+      end
+
+      def load
+        old_query = @query.dup
+        @query.reset
+        return old_query.execute
+      end
+
+      def find(id)
+        @query << {'sys.id' => id}
+        load.first
+      end
+
+    end
+  end
+end

data/lib/contentful_model/query.rb

@@ -1,17 +1,27 @@
 module ContentfulModel
   class Query
     attr_accessor :parameters
-    def initialize(reference_class, parameters=nil)
-      @parameters = parameters || { 'content_type' => reference_class.content_type_id }
-      @client = reference_class.client
+    def initialize(referenced_class, parameters=nil)
+      @parameters = parameters || {}
+      @client = referenced_class.send(:client)
+      @referenced_class = referenced_class
     end
 
     def <<(parameters)
       @parameters.merge!(parameters)
     end
 
+    def default_parameters
+      { 'content_type' => @referenced_class.send(:content_type_id) }
+    end
+
     def execute
-      @client.entries(@parameters)
+      query = @parameters.merge!(default_parameters)
+      return @client.entries(query)
+    end
+
+    def reset
+      @parameters = default_parameters
     end
   end
 end

data/lib/contentful_model/version.rb

@@ -1,3 +1,3 @@
 module ContentfulModel
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/contentful_model.rb

@@ -1,5 +1,6 @@
 require 'contentful'
 require "contentful_model/query"
+require "contentful_model/queries"
 require "contentful_model/chainable_queries"
 require "contentful_model/base"
 require "active_support"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_model
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Error Creative Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful
@@ -65,6 +65,7 @@ files:
 - lib/contentful_model.rb
 - lib/contentful_model/base.rb
 - lib/contentful_model/chainable_queries.rb
+- lib/contentful_model/queries.rb
 - lib/contentful_model/query.rb
 - lib/contentful_model/version.rb
 - lib/tasks/contentful_rails_tasks.rake