restulicious 0.1.4 → 0.1.5

data/lib/restulicious/adapter/default.rb

@@ -2,29 +2,21 @@ module Restulicious
   module Adapter
     class Default
 
-      def initialize(klazz, key)
-        @klazz = klazz
-        @key   = key
+      def initialize(klazz, key, request_options, headers)
+        @klazz           = klazz
+        @key             = key
+        @request_options = request_options
+        @headers         = headers
       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)
+        request = ::Typhoeus::Request.new(url, request_options.merge(method: :get, 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)
+        request = ::Typhoeus::Request.new(url, request_options.merge(method: :post, body: params.to_json))
         hydra.queue(request)
         handle_response(request, &block)
       end
@@ -43,6 +35,14 @@ module Restulicious
 
       private
 
+      def request_options
+          {
+            headers:       { Accept: "application/json" }.merge(@headers),
+            timeout:       100000, # milliseconds
+            cache_timeout: 60 # seconds
+          }.merge(@request_options)
+      end
+
       def parser(response)
         Restulicious.config.parser_class.new(@klazz, @key, response.body)
       end

data/lib/restulicious/adapter/rest_api.rb

@@ -2,7 +2,7 @@ module Restulicious
   module Adapter
     class RESTApi
 
-      def initialize(klazz, key)
+      def initialize(klazz, key, request_options, headers)
         @klazz = klazz
         @key   = key
       end
@@ -17,6 +17,11 @@ module Restulicious
         handle_response(&block)
       end
 
+      def put(url, params, &block)
+        @request = ::RESTApi.put(url, params)
+        handle_response(&block)
+      end
+
       def on_success(&block)
         @on_success = block
       end
@@ -61,8 +66,8 @@ module Restulicious
           end
         end
         if @on_failure
-          @request.on_failure do |response|
-            @on_failure.call(parser(response).result)
+          @request.on_failure do |response, exception|
+            @on_failure.call(response, exception)
           end
         end
         if block_given?

data/lib/restulicious/attributes.rb

@@ -19,7 +19,7 @@ module Restulicious
       self.class.attribute_names.each do |attr_name|
         instance_variable_set("@#{attr_name}", check_utf8(attributes[attr_name]))
       end
-      super
+      super()
     end
 
     private

data/lib/restulicious/collection.rb

@@ -0,0 +1,43 @@
+module Restulicious
+  class Collection
+    include Enumerable
+    include Attributes
+
+    attr_accessor :collection_key
+
+    def self.from_parser(klazz, collection_key, data)
+      setup_collection_of_items(klazz, collection_key, data)
+      self.attributes *data.keys
+      collection = new(data)
+      collection.collection_key = collection_key
+      collection
+    end
+
+    def each(&block)
+      collection_accessor.each(&block)
+    end
+
+    def method_missing(sym, *args, &block)
+      if collection_accessor.respond_to?(sym)
+        collection_accessor.send(sym, *args, &block)
+      else
+        super(sym, *args, &block)
+      end
+    end
+
+    private
+
+    def collection_accessor
+      send(collection_key)
+    end
+
+    def self.setup_collection_of_items(klazz, collection_key, attributes)
+      collection = []
+      attributes.delete(collection_key).each do |object_attributes|
+        collection << klazz.from_api(object_attributes.symbolize_keys!)
+      end
+      attributes[collection_key] = collection
+    end
+
+  end
+end

data/lib/restulicious/coordinator.rb

@@ -1,15 +1,32 @@
 module Restulicious
   class Coordinator
 
+    attr_accessor :request_options, :headers
+
     def initialize(klazz, api_options)
       @klazz = klazz
       api_options(api_options)
+      @request_options ||= {}
+      @headers ||= {}
     end
 
     def query_interface
       @query_interface ||= Restulicious::QueryInterface.new(@url)
     end
 
+    def basic_auth(username, password)
+      request_options[:username] = username
+      request_options[:password] = password
+      self
+    end
+
+    def headers(header_hash)
+      header_hash.each do |key, value|
+        @headers[key] = value
+      end
+      self
+    end
+
     def where(*args)
       query_interface.where(*args)
       self
@@ -47,6 +64,10 @@ module Restulicious
       adapter.post(query_interface.first_url, query_interface.params, &block)
     end
 
+    def update(&block)
+      adapter.put(query_interface.first_url, query_interface.params, &block)
+    end
+
     def on_failure(&block)
       adapter.on_failure(&block)
       self
@@ -63,6 +84,7 @@ module Restulicious
     end
 
     def api_options(options)
+      option ||= {}
       @url  = options[:url]
       @type = options[:type]
       @key  = options[:key]
@@ -71,7 +93,7 @@ module Restulicious
     private
 
     def adapter
-      @adapter ||= Restulicious.config.adapter_class.new(@klazz, key)
+      @adapter ||= Restulicious.config.adapter_class.new(@klazz, key, request_options, @headers)
     end
 
     def key

data/lib/restulicious/parser/default.rb

@@ -2,16 +2,23 @@ module Restulicious
   module Parser
     class Default
 
-      def initialize(klazz, key, body)
-        @klazz = klazz
-        @key   = key
-        @body  = body
+      def initialize(klazz, collection_key, body)
+        @klazz          = klazz
+        @collection_key = collection_key
+        @body           = body
       end
 
       def result
         if collection?
-          set_collection
-          hashified_body
+          if @collection_key == "none"
+            collection = []
+            hashified_body.each do |object_attributes|
+              collection << @klazz.from_api(object_attributes.symbolize_keys!)
+            end
+            collection
+          else
+            Restulicious::Collection.from_parser(@klazz, @collection_key, hashified_body)
+          end
         else
           @klazz.from_api(hashified_body.symbolize_keys!)
         end
@@ -24,19 +31,11 @@ module Restulicious
       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!)
+        if @collection_key == "none"
+          hashified_body.is_a?(Array)
+        else
+          hashified_body[@collection_key].is_a?(Array)
         end
-        hashified_body[@key] = collection
       end
 
     end

data/lib/restulicious/query_methods.rb

@@ -4,6 +4,14 @@ module Restulicious
 
     module ClassMethods
 
+      def basic_auth(username, password)
+        coordinator.basic_auth(username, password)
+      end
+
+      def headers(header_hash)
+        coordinator.headers(header_hash)
+      end
+
       def where(params)
         coordinator.where(params)
       end
@@ -36,6 +44,10 @@ module Restulicious
         coordinator.create(&block)
       end
 
+      def update(&bock)
+        coordinator.update(&block)
+      end
+
       private
 
       def api_options(options)

data/lib/restulicious/version.rb

@@ -1,3 +1,3 @@
 module Restulicious
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/restulicious.rb

@@ -9,6 +9,7 @@ module Restulicious
   autoload :QueryInterface,  "restulicious/query_interface"
   autoload :Config,          "restulicious/config"
   autoload :Coordinator,     "restulicious/coordinator"
+  autoload :Collection,      "restulicious/collection"
   autoload :Adapter,         "restulicious/adapter"
   Adapter.autoload :Default, "restulicious/adapter/default"
   Adapter.autoload :RESTApi, "restulicious/adapter/rest_api"

data/test/support/dummy_class.rb

@@ -1,2 +1,11 @@
 class DummyClass
+  include Restulicious::QueryMethods
+  include Restulicious::Attributes
+  attributes :id, :name
+  api_options url: "www.awesome.com/stuff",
+    key: "dummies"
+
+  def self.from_api(attributes)
+    new(attributes)
+  end
 end

data/test/unit/collection_test.rb

@@ -0,0 +1,28 @@
+require File.expand_path('../../support/test_helper', __FILE__)
+
+describe Restulicious::Collection do
+  before do
+    dummies = [
+      { id: 1, name: "Einstein" },
+      { id: 2, name: "Jobs" }
+    ]
+    data = { "collection" => dummies, "total" => 2 }
+    @collection = Restulicious::Collection.from_parser(DummyClass, "collection", data)
+  end
+
+  it "contains DummyClass objects" do
+   assert_kind_of DummyClass, @collection.first
+  end
+
+  it "each runs on the objects" do
+    @collection.each do |item|
+      assert_kind_of DummyClass, @collection.first
+    end
+  end
+
+  it "sets others keys as methods" do
+    assert_equal 2, @collection.total
+  end
+
+end
+

data/test/unit/coordinator_test.rb

@@ -4,7 +4,7 @@ describe Restulicious::Coordinator do
   describe "Interface" do
 
     before do
-      @coordinator = Restulicious::Coordinator.new(Class.new)
+      @coordinator = Restulicious::Coordinator.new(Class.new, {})
       @coordinator.instance_variable_set(:@url, "www.example.com")
     end
 

data/test/unit/query_methods_test.rb

@@ -2,10 +2,6 @@ require File.expand_path('../../support/test_helper', __FILE__)
 
 describe Restulicious::QueryMethods do
 
-  before do
-    DummyClass.send(:include, Restulicious::QueryMethods)
-  end
-
   it "has where method, which sends to coordinator" do
     Restulicious::Coordinator.any_instance.expects(:where).with(id: 5)
     DummyClass.where(id: 5)
@@ -41,13 +37,5 @@ describe Restulicious::QueryMethods do
     DummyClass.all
   end
 
-  it "has api_options method, which sends to coordinator" do
-    options = {
-      url:    "www.awesome.com/stuff"
-    }
-    Restulicious::Coordinator.any_instance.expects(:api_options).with(options)
-    DummyClass.send(:api_options, options)
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restulicious
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,7 @@ files:
 - lib/restulicious/adapter/default.rb
 - lib/restulicious/adapter/rest_api.rb
 - lib/restulicious/attributes.rb
+- lib/restulicious/collection.rb
 - lib/restulicious/config.rb
 - lib/restulicious/connection.rb
 - lib/restulicious/coordinator.rb
@@ -138,6 +139,7 @@ files:
 - test/support/dummy_class.rb
 - test/support/test_helper.rb
 - test/unit/attributes_test.rb
+- test/unit/collection_test.rb
 - test/unit/config_test.rb
 - test/unit/connection/default_test.rb
 - test/unit/coordinator_test.rb
@@ -172,6 +174,7 @@ test_files:
 - test/support/dummy_class.rb
 - test/support/test_helper.rb
 - test/unit/attributes_test.rb
+- test/unit/collection_test.rb
 - test/unit/config_test.rb
 - test/unit/connection/default_test.rb
 - test/unit/coordinator_test.rb