masheri 0.3.10 → 0.4.0

data/lib/masheri.rb

@@ -9,6 +9,7 @@ require 'masheri/exceptions'
 require 'masheri/config'
 
 require 'masheri/rpc_client'
+require 'masheri/rpc_client/response'
 
 require 'masheri/rest_client'
 require 'masheri/query_builder'

data/lib/masheri/query_builder.rb

@@ -55,15 +55,15 @@ module Masheri
     end
 
     def all
-      Masheri::RpcResponse.new(self)
+      Masheri::RpcClient::Response.new(self)
     end
 
     def find_each(&block)
-      Masheri::RpcResponse.new(self).find_each(&block)
+      Masheri::RpcClient::Response.new(self).find_each(&block)
     end
 
     def first
-      Masheri::RpcResponse.new(items(1)).to_objects.first
+      Masheri::RpcClient::Response.new(items(1)).to_objects.first
     end
 
     protected

data/lib/masheri/rpc_client.rb

@@ -1,80 +1,4 @@
 module Masheri
-  class RpcResponse
-    def initialize(query_builder)
-      @query_builder = query_builder
-      @json          = query_builder.to_json
-    end
-
-    def result
-      @json["result"]
-    end
-
-    def error
-      @json["error"]
-    end
-
-    def items
-      result["items"]
-    end
-
-    def to_objects
-      items.map do |item|
-        @query_builder.reify(item)
-      end
-    end
-
-    def find_each(&block)
-      to_objects.each(&block)
-
-      if next_page?
-        response = next_page!
-        response.find_each(&block)
-      end
-    end
-
-    def error?
-      error.present?
-    end
-
-    def length
-      items.length
-    end
-
-    def more_pages?
-      current_page < total_pages
-    end
-
-    alias :next_page? :more_pages?
-
-    def next_page_number
-      current_page + 1
-    end
-
-    # Can't call Mashery too many times, or they get mad
-    MASHERY_WAIT_TIME = 0.1
-
-    def next_page!
-      sleep(MASHERY_WAIT_TIME)
-      RpcResponse.new(@query_builder.page(next_page_number))
-    end
-
-    def total_items
-      result["total_items"]
-    end
-
-    def total_pages
-      result["total_pages"]
-    end
-
-    def current_page
-      result["current_page"]
-    end
-
-    def items_per_page
-      result["items_per_page"]
-    end
-  end
-
   class RpcClient
     def config
       Masheri.config

data/lib/masheri/rpc_client/response.rb

@@ -0,0 +1,79 @@
+module Masheri
+  class RpcClient
+    class Response
+      def initialize(query_builder)
+        @query_builder = query_builder
+        @json          = query_builder.to_json
+      end
+
+      def result
+        @json["result"]
+      end
+
+      def error
+        @json["error"]
+      end
+
+      def items
+        result["items"]
+      end
+
+      def to_objects
+        items.map do |item|
+          @query_builder.reify(item)
+        end
+      end
+
+      def find_each(&block)
+        to_objects.each(&block)
+
+        if next_page?
+          response = next_page!
+          response.find_each(&block)
+        end
+      end
+
+      def error?
+        error.present?
+      end
+
+      def length
+        items.length
+      end
+
+      def more_pages?
+        current_page < total_pages
+      end
+
+      alias :next_page? :more_pages?
+
+      def next_page_number
+        current_page + 1
+      end
+
+      # Can't call Mashery too many times, or they get mad
+      MASHERY_WAIT_TIME = 0.1
+
+      def next_page!
+        sleep(MASHERY_WAIT_TIME)
+        Response.new(@query_builder.page(next_page_number))
+      end
+
+      def total_items
+        result["total_items"]
+      end
+
+      def total_pages
+        result["total_pages"]
+      end
+
+      def current_page
+        result["current_page"]
+      end
+
+      def items_per_page
+        result["items_per_page"]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masheri
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -60,14 +60,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -176,6 +176,7 @@ files:
 - lib/masheri/rest_client/base.rb
 - lib/masheri/rest_client/query.rb
 - lib/masheri/rpc_client.rb
+- lib/masheri/rpc_client/response.rb
 - lib/masheri/service.rb
 - LICENSE.txt
 - README.md
@@ -195,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2820151414351842610
+      hash: -3229905518716207910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: