restulicious 0.0.13 → 0.1.1

data/lib/restulicious/adapter/default.rb

@@ -0,0 +1,83 @@
+module Restulicious
+  module Adapter
+    class Default
+
+      def initialize(klazz, key)
+        @klazz = klazz
+        @key   = key
+      end
+
+      def get(url, params, &block)
+        request = ::Typhoeus::Request.new(url,
+          method:        :get,
+          headers:       { Accept: "application/json" },
+          timeout:       100000, # milliseconds
+          cache_timeout: 60, # seconds
+          params:        params)
+        hydra.queue(request)
+        handle_response(request, &block)
+      end
+
+      def post(url, params, &block)
+        request = ::Typhoeus::Request.new(url,
+          method:        :post,
+          headers:       { Accept: "application/json" },
+          timeout:       100000, # milliseconds
+          cache_timeout: 60, # seconds
+          body:          params.to_json)
+        hydra.queue(request)
+        handle_response(request, &block)
+      end
+
+      def on_success(&block)
+        @on_success = block
+      end
+
+      def on_complete(&block)
+        @on_complete = block
+      end
+
+      def on_failure(&block)
+        @on_failure = block
+      end
+
+      private
+
+      def parser(response)
+        Restulicious.config.parser_class.new(@klazz, @key, response.body)
+      end
+
+      def hydra
+        Restulicious.config.hydra
+      end
+
+      def handle_response(request, &block)
+        if @on_success
+          request.on_success do |response|
+            @on_success.call(parser(response).result)
+          end
+        end
+        if @on_complete
+          request.on_complete do |response|
+            @on_complete.call(parser(response).result)
+          end
+        end
+        if @on_failure
+          request.on_failure do |response|
+            @on_failure.call(parser(response).result)
+          end
+        end
+        if block_given?
+          request.on_complete do |response|
+            block.call(parser(response).result)
+          end
+        elsif !@on_success && !@on_complete
+          hydra.run
+          parser(request.response).result
+        end
+      end
+    end
+  end
+end
+
+

data/lib/restulicious/adapter/rest_api.rb

@@ -0,0 +1,73 @@
+module Restulicious
+  module Adapter
+    class RESTApi
+
+      def initialize(klazz, key)
+        @klazz = klazz
+        @key   = key
+      end
+
+      def get(url, params, &block)
+        request = ::RESTApi.get(url, params)
+        handle_response(request, &block)
+      end
+
+      def post(url, params, &block)
+        request = ::RESTApi.post(url, params)
+        handle_response(request, &block)
+      end
+
+      def on_success(&block)
+        @on_success = block
+      end
+
+      def on_complete(&block)
+        @on_complete = block
+      end
+
+      def on_failure(&block)
+        @on_failure = block
+      end
+
+      private
+
+      def parser(response)
+        Restulicious.config.parser_class.new(@klazz, @key, response.body)
+      end
+
+      def hydra
+        Restulicious.config.hydra
+      end
+
+      def handle_response(request, &block)
+        if @on_success
+          request.on_success do |response|
+            @on_success.call(parser(response).result)
+          end
+        end
+        if @on_complete
+          request.on_complete do |response|
+            @on_complete.call(parser(response).result)
+          end
+        end
+        if @on_failure
+          request.on_failure do |response|
+            @on_failure.call(parser(response).result)
+          end
+        end
+        if block_given?
+          request.on_complete do |response|
+            block.call(parser(response).result)
+          end
+        elsif !@on_success && !@on_complete
+          hydra.run
+          parser(request.response).result
+        end
+      end
+    end
+  end
+end
+
+
+
+

data/lib/restulicious/adapter.rb

@@ -0,0 +1,4 @@
+module Restulicious
+  module Adapter
+  end
+end

data/lib/restulicious/config.rb

@@ -1,12 +1,12 @@
 module Restulicious
   class Config
 
-    attr_accessor :hydra, :connection_class, :parser_class
+    attr_accessor :hydra, :adapter_class, :parser_class
 
     def initialize
       self.hydra            = Typhoeus::Hydra.new
-      self.connection_class = Connection
-      self.parser_class     = Parser
+      self.adapter_class    = Adapter::Default
+      self.parser_class     = Parser::Default
     end
 
   end

data/lib/restulicious/connection.rb

@@ -1,24 +1,5 @@
 module Restulicious
-  class Connection
-
-    def get(url, params)
-      request = ::Typhoeus::Request.new(url,
-        method:        :get,
-        headers:       { Accept: "application/json" },
-        timeout:       100000, # milliseconds
-        cache_timeout: 60, # seconds
-        params:        params)
-    end
-
-    def post(url, params)
-      request = ::Typhoeus::Request.new(url,
-        method:        :post,
-        headers:       { Accept: "application/json" },
-        timeout:       100000, # milliseconds
-        cache_timeout: 60, # seconds
-        body:          params.to_json)
-    end
-
+  module Connection
   end
 end
 

data/lib/restulicious/coordinator.rb

@@ -3,7 +3,6 @@ module Restulicious
 
     def initialize(klazz)
       @klazz = klazz
-      @after_complete_methods = []
     end
 
     def query_interface
@@ -35,30 +34,31 @@ module Restulicious
       self
     end
 
-    def includes(*args)
-      @after_complete_methods = args
-      self
+    def first(&block)
+      adapter.get(query_interface.first_url, query_interface.params, &block)
+    end
+
+    def all(&block)
+      adapter.get(query_interface.first_url, query_interface.params, &block)
     end
 
-    def first
-      @request = connection.get(query_interface.first_url, query_interface.params)
-      hydra.queue(@request)
-      hydra.run
-      parse.first
+    def create(&block)
+      adapter.post(query_interface.first_url, query_interface.params, &block)
     end
 
-    def all
-      @request = connection.get(query_interface.all_url, query_interface.params)
-      hydra.queue(@request)
-      hydra.run
-      parse
+    def on_failure(&block)
+      adapter.on_failure(&block)
+      self
+    end
+
+    def on_success(&block)
+      adapter.on_success(&block)
+      self
     end
 
-    def create
-      @request = connection.post(query_interface.all_url, query_interface.params)
-      hydra.queue(@request)
-      hydra.run
-      # parse
+    def on_complete(&block)
+      adapter.on_complete(&block)
+      self
     end
 
     def api_options(options)
@@ -69,24 +69,8 @@ module Restulicious
 
     private
 
-    def connection
-      Restulicious.config.connection_class.new
-    end
-
-    def parser
-      Restulicious.config.parser_class.new(@klazz, key, @request.response.body)
-    end
-
-    def parse
-      objects = parser.objects
-      @after_complete_methods.each do |name|
-        @klazz.send("after_api_complete_#{name}", objects)
-      end
-      objects
-    end
-
-    def hydra
-      Restulicious.config.hydra
+    def adapter
+      @adapter ||= Restulicious.config.adapter_class.new(@klazz, key)
     end
 
     def key

data/lib/restulicious/parser/default.rb

@@ -0,0 +1,44 @@
+module Restulicious
+  module Parser
+    class Default
+
+      def initialize(klazz, key, body)
+        @klazz = klazz
+        @key   = key
+        @body  = body
+      end
+
+      def result
+        if collection?
+          set_collection
+          hashified_body
+        else
+          @klazz.from_api(hashified_body.symbolize_keys!)
+        end
+      end
+
+      private
+
+      def hashified_body
+        @hashified_body ||= JSON.parse(@body)
+      end
+
+      def collection?
+        hashified_body[@key].is_a?(Array)
+      end
+
+      def struct
+        @struct ||= OpenStruct.new
+      end
+
+      def set_collection
+        collection = []
+        hashified_body.delete(@key).each do |object_attributes|
+          collection << @klazz.from_api(object_attributes.symbolize_keys!)
+        end
+        hashified_body[@key] = collection
+      end
+
+    end
+  end
+end

data/lib/restulicious/parser.rb

@@ -1,33 +1,4 @@
 module Restulicious
-  class Parser
-
-    def initialize(klazz, key, body)
-      @klazz = klazz
-      @key   = key
-      @body  = body
-    end
-
-    def objects
-      objects = []
-      if collection?
-        hashified_body[@key].each do |object_attributes|
-          objects << @klazz.from_api(object_attributes.symbolize_keys!)
-        end
-      else
-        objects << @klazz.from_api(hashified_body.symbolize_keys!)
-      end
-      objects
-    end
-
-    private
-
-    def hashified_body
-      @hashified_body ||= JSON.parse(@body)
-    end
-
-    def collection?
-      hashified_body[@key].is_a?(Array)
-    end
-
+  module Parser
   end
 end

data/lib/restulicious/query_methods.rb

@@ -24,20 +24,16 @@ module Restulicious
         coordinator.select(fields)
       end
 
-      def includes(*args)
-        coordinator.includes(*args)
+      def first(&block)
+        coordinator.first(&block)
       end
 
-      def first
-        coordinator.first
+      def all(&block)
+        coordinator.all(&block)
       end
 
-      def all
-        coordinator.all
-      end
-
-      def create
-        coordinator.create
+      def create(&block)
+        coordinator.create(&block)
       end
 
       private

data/lib/restulicious/version.rb

@@ -1,3 +1,3 @@
 module Restulicious
-  VERSION = "0.0.13"
+  VERSION = "0.1.1"
 end

data/lib/restulicious.rb

@@ -4,13 +4,16 @@ require "restulicious/version"
 require 'active_support/all'
 
 module Restulicious
-  autoload :Attributes,     "restulicious/attributes"
-  autoload :QueryMethods,   "restulicious/query_methods"
-  autoload :QueryInterface, "restulicious/query_interface"
-  autoload :Config,         "restulicious/config"
-  autoload :Coordinator,    "restulicious/coordinator"
-  autoload :Connection,     "restulicious/connection"
-  autoload :Parser,         "restulicious/parser"
+  autoload :Attributes,      "restulicious/attributes"
+  autoload :QueryMethods,    "restulicious/query_methods"
+  autoload :QueryInterface,  "restulicious/query_interface"
+  autoload :Config,          "restulicious/config"
+  autoload :Coordinator,     "restulicious/coordinator"
+  autoload :Adapter,         "restulicious/adapter"
+  Adapter.autoload :Default, "restulicious/adapter/default"
+  Adapter.autoload :RESTApi, "restulicious/adapter/rest_api"
+  autoload :Parser,          "restulicious/parser"
+  Parser.autoload :Default,  "restulicious/parser/default"
 
   def self.config
     @config ||= Config.new

data/test/unit/config_test.rb

@@ -4,54 +4,54 @@ describe Restulicious::Config do
   describe "with block" do
     it "has defaults" do
       Restulicious.config {}
-      assert_kind_of Typhoeus::Hydra,          Restulicious.config.hydra
-      assert_equal   Restulicious::Parser,     Restulicious.config.parser_class
-      assert_equal   Restulicious::Connection, Restulicious.config.connection_class
+      assert_kind_of Typhoeus::Hydra,                Restulicious.config.hydra
+      assert_equal   Restulicious::Parser::Default,  Restulicious.config.parser_class
+      assert_equal   Restulicious::Adapter::Default, Restulicious.config.adapter_class
     end
 
     it "set options overrides defaults" do
       Restulicious.config do |config|
-        config.connection_class   = "boo"
-        config.hydra        = "yah"
-        config.parser_class = "w00t"
+        config.adapter_class = "boo"
+        config.hydra         = "yah"
+        config.parser_class  = "w00t"
       end
-      assert_equal "boo",  Restulicious.config.connection_class
+      assert_equal "boo",  Restulicious.config.adapter_class
       assert_equal "yah",  Restulicious.config.hydra
       assert_equal "w00t", Restulicious.config.parser_class
     end
 
     it "set 1 option, other defaults remain" do
       Restulicious.config do |config|
-        config.connection_class   = "boo"
+        config.adapter_class   = "boo"
       end
-      assert_equal   "boo",                Restulicious.config.connection_class
-      assert_kind_of Typhoeus::Hydra,      Restulicious.config.hydra
-      assert_equal   Restulicious::Parser, Restulicious.config.parser_class
+      assert_equal   "boo",                         Restulicious.config.adapter_class
+      assert_kind_of Typhoeus::Hydra,               Restulicious.config.hydra
+      assert_equal   Restulicious::Parser::Default, Restulicious.config.parser_class
     end
 
   end
 
   describe "without block" do
     it "has defaults" do
-      assert_kind_of Typhoeus::Hydra,          Restulicious.config.hydra
-      assert_equal   Restulicious::Parser,     Restulicious.config.parser_class
-      assert_equal   Restulicious::Connection, Restulicious.config.connection_class
+      assert_kind_of Typhoeus::Hydra,                Restulicious.config.hydra
+      assert_equal   Restulicious::Parser::Default,  Restulicious.config.parser_class
+      assert_equal   Restulicious::Adapter::Default, Restulicious.config.adapter_class
     end
 
     it "set options overrides defaults" do
-      Restulicious.config.connection_class   = "boo"
-      Restulicious.config.hydra        = "yah"
-      Restulicious.config.parser_class = "w00t"
-      assert_equal "boo",  Restulicious.config.connection_class
+      Restulicious.config.adapter_class = "boo"
+      Restulicious.config.hydra         = "yah"
+      Restulicious.config.parser_class  = "w00t"
+      assert_equal "boo",  Restulicious.config.adapter_class
       assert_equal "yah",  Restulicious.config.hydra
       assert_equal "w00t", Restulicious.config.parser_class
     end
 
     it "set 1 option, other defaults remain" do
-      Restulicious.config.connection_class   = "boo"
-      assert_equal   "boo",                Restulicious.config.connection_class
-      assert_kind_of Typhoeus::Hydra,      Restulicious.config.hydra
-      assert_equal   Restulicious::Parser, Restulicious.config.parser_class
+      Restulicious.config.adapter_class   = "boo"
+      assert_equal   "boo",                         Restulicious.config.adapter_class
+      assert_kind_of Typhoeus::Hydra,               Restulicious.config.hydra
+      assert_equal   Restulicious::Parser::Default, Restulicious.config.parser_class
     end
 
   end

data/test/unit/{connection_test.rb → connection/default_test.rb}

@@ -1,9 +1,9 @@
 require File.expand_path('../../support/test_helper', __FILE__)
 
-describe Restulicious::Connection do
+describe Restulicious::Connection::Default do
 
   it "has a get method, that expects url and params" do
-    Restulicious::Connection.new.get("http://www.example.com", { id: 123 })
+    Restulicious::Connection::Default.new.get("http://www.example.com", { id: 123 })
   end
 
 end

data/test/unit/coordinator_test.rb

@@ -56,11 +56,6 @@ describe Restulicious::Coordinator do
       @coordinator.from("www.what.com").offset(10).limit(100).where(id: 42).select("id,name").all
     end
 
-    it "includes stores args in after_complete_methods" do
-      @coordinator.includes(:users, :comments)
-      assert_equal [:users, :comments], @coordinator.instance_variable_get(:@after_complete_methods)
-    end
-
     it "has first method"
     it "has all method"
   end

data/test/unit/query_methods_test.rb

@@ -41,7 +41,6 @@ describe Restulicious::QueryMethods do
     DummyClass.all
   end
 
-
   it "has api_options method, which sends to coordinator" do
     options = {
       url:    "www.awesome.com/stuff"
@@ -50,14 +49,5 @@ describe Restulicious::QueryMethods do
     DummyClass.send(:api_options, options)
   end
 
-  it "has includes method, which sends to coordinator" do
-    Restulicious::Coordinator.any_instance.expects(:includes).with(:user)
-    DummyClass.includes(:user)
-  end
-
-  it "has includes method, that allows multiple arguments" do
-    Restulicious::Coordinator.any_instance.expects(:includes).with(:user, :comments)
-    DummyClass.includes(:user, :comments)
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restulicious
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,11 +122,15 @@ files:
 - README.md
 - Rakefile
 - lib/restulicious.rb
+- lib/restulicious/adapter.rb
+- lib/restulicious/adapter/default.rb
+- lib/restulicious/adapter/rest_api.rb
 - lib/restulicious/attributes.rb
 - lib/restulicious/config.rb
 - lib/restulicious/connection.rb
 - lib/restulicious/coordinator.rb
 - lib/restulicious/parser.rb
+- lib/restulicious/parser/default.rb
 - lib/restulicious/query_interface.rb
 - lib/restulicious/query_methods.rb
 - lib/restulicious/version.rb
@@ -135,7 +139,7 @@ files:
 - test/support/test_helper.rb
 - test/unit/attributes_test.rb
 - test/unit/config_test.rb
-- test/unit/connection_test.rb
+- test/unit/connection/default_test.rb
 - test/unit/coordinator_test.rb
 - test/unit/query_interface_test.rb
 - test/unit/query_methods_test.rb
@@ -169,7 +173,7 @@ test_files:
 - test/support/test_helper.rb
 - test/unit/attributes_test.rb
 - test/unit/config_test.rb
-- test/unit/connection_test.rb
+- test/unit/connection/default_test.rb
 - test/unit/coordinator_test.rb
 - test/unit/query_interface_test.rb
 - test/unit/query_methods_test.rb