sk-api 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/activeresource_patches/base.rb

@@ -19,5 +19,26 @@ module ActiveResource
         load( self.class.format.decode(response.body)[self.class.element_name] )
       end
     end
+
+    # Ooverridden to grab the data(clients- collection) from json:
+    # { 'collection'=> will_paginate infos,
+    #   'links' => prev/next links
+    #   >> 'clients'=> [data], <<
+    # }
+    def self.instantiate_collection(collection, prefix_options = {})
+      collection = collection[ self.element_name.pluralize ] if collection.is_a?(Hash)
+      collection.collect! { |record| instantiate_record(record, prefix_options) }
+    end
   end
 end
+
+# Force json decoding using Rufus
+module ActiveResource
+  module Formats
+    module JsonFormat
+      def decode(json)        
+        Rufus::Json.decode(json)
+      end
+    end
+  end
+end

data/lib/resources/client.rb

@@ -3,7 +3,6 @@ module SKApi
     class Client < SKApi::Resources::Base
 
       def save
-#        validate_schema
         save_with_validation
       end
 

data/lib/resources/product.rb

@@ -3,26 +3,16 @@ module SKApi
     class Product < SKApi::Resources::Base
 
       def save
-#        validate_schema
         save_with_validation
       end
 
-      # not realy stable yet
-      def validate_schema
-        json = self.to_json
-        obj = Rufus::Json.decode(json)
-        JSON::Schema.validate(obj,  SKApi::Resources::Product.schema)
-      end
-
       def self.schema
         { "type" => "object",
         "properties" => SKApi::Resources::Product.schema_props}
       end
 
       def self.schema_props
-       {
-#	category
-#	template_id
+        {
            "id"           => {"type" => "string", "identity" => true , "readonly" => true},
            "number"       => {"type" => "string", "optional" => true},
            "name"         => {"type" => "string"},

data/lib/sk_api.rb

@@ -1,16 +1,15 @@
 require 'rubygems'
+require 'active_resource'
 # patches are for specific AR version
-gem 'activeresource' , '=2.3.4'
+#gem 'activeresource' , '=2.3.4'
 
 unless RUBY_PLATFORM =~ /java/
   require 'yajl'
   require 'rufus-json'
-
   Rufus::Json.backend = :yajl
 else
   require 'json'
   require 'rufus-json'
-
   Rufus::Json.backend = :json
 end
 

data/spec/resources/client_spec.rb

@@ -29,11 +29,16 @@ describe SKApi::Resources::Client, "in general" do
     client.errors.full_messages.should ==  ["Bank iban is invalid"]
   end
 
-  it "should find a client" do
+  it "should find a single client" do
     client = SKApi::Resources::Client.find(@client.id)
     client.organisation.should == @client.organisation
   end
 
+  it "should find clients" do
+    clients = SKApi::Resources::Client.find(:all)
+    clients.should_not be_empty
+  end
+
   it "should edit a client" do
     @client.first_name = 'Theodore'
     @client.gender = 'male'
@@ -47,7 +52,7 @@ describe SKApi::Resources::Client, "in general" do
     @client.organisation = ''
     @client.save.should == false
     @client.errors.count.should == 1
-    @client.errors.on_base.should ==  "<p>clients.errors.fill_name_or_organisation</p>"
+    @client.errors.on_base.should == "Organisation or lastname must be present."
   end
 
   it "should validate raw json object with schema" do

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ SKApi::CONNECTION = {
     :user => "demo@salesking.eu",
     :password => "demo",
     :format => :json
-  }
+  } unless defined?(SKApi::CONNECTION)
 SKApi::Resources::Base.set_connection(SKApi::CONNECTION)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Georg Leciejewski
@@ -57,7 +57,6 @@ files:
 - lib/sk_api.rb
 - lib/utils/field_map.rb
 - lib/utils/serializer.rb
-- lib/version.rb
 - spec/resources/client_spec.rb
 - spec/resources/credit_note_spec.rb
 - spec/resources/product_spec.rb

data/lib/version.rb

@@ -1,9 +0,0 @@
-module SKApi
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 0
-    TINY  = 1
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end