sk-api 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/activeresource_patches/base.rb

@@ -20,25 +20,14 @@ module ActiveResource
       end
     end
 
-    # Ooverridden to grab the data(clients- collection) from json:
+    # Ooverridden to grab the data(= clients-collection) from json:
     # { 'collection'=> will_paginate infos,
     #   'links' => prev/next links
-    #   >> 'clients'=> [data], <<
+    #   'clients'=> [data], << what we need
     # }
     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/base.rb

@@ -13,10 +13,10 @@ module SKApi
 
       # Define the connection to be used when talking to a salesking server
       def self.set_connection(opts)
-        self.site = opts[:site]        #"http://demo.salesking.local:3000/api/"
-        self.user = opts[:user]        # "demo@salesking.eu"
-        self.password = opts[:password]   #"demo"
-        self.format = opts[:format].to_sym    #:json
+        self.site     = opts[:site]
+        self.user     = opts[:user]
+        self.password = opts[:password]
+        self.format   = opts[:format].to_sym
       end
 
     end

data/lib/resources/client.rb

@@ -6,13 +6,6 @@ module SKApi
         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::Client.schema)
-      end
-
       def self.schema
         { "type" => "object",
         "properties" => SKApi::Resources::Client.schema_props}

data/lib/resources/line_item.rb

@@ -12,7 +12,7 @@ module SKApi
       end
 
       def self.schema_props
-       {
+        {
            "id"             => {"type" => "string", "identity" => true , "readonly" => true},
            "position"       => {"type" => "integer"},
            "product_id"     => {"type" => "string", "optional" => true},
@@ -23,9 +23,10 @@ module SKApi
            "price_single"   => {"type" => "number"},
            "discount"       => {"type" => "number", "optional" => true},
            "tax"            => {"type" => "number", "optional" => true},
+           "use_product"    => {"type" => "boolean", "optional" => true},
            "created_at"     => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true},
            "updated_at"     => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true}
-         }
+        }
       end
     end
   end

data/lib/resources/product.rb

@@ -23,8 +23,8 @@ module SKApi
            "tag_list"     => {"type" => "string", "optional" => true},
            "lock_version" => {"type" => "integer", "readonly" => true, "optional" => true},
            "published_at" => {"type" => "string", "format" =>"date", "optional" => true},
-           "created_at"   => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true},
-           "updated_at"   => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true},
+           "created_at"   => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true },
+           "updated_at"   => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true },
          }
       end #schema_props
 

data/spec/resources/invoice_spec.rb

@@ -3,36 +3,42 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
 describe SKApi::Resources::Invoice, "in general" do
 
   before :all do
-    #setup test doc to work with
-    # create client
     @client = SKApi::Resources::Client.new(:organisation=>'Invoice API-Tester')
     @client.save.should be_true
-#    @doc = SKApi::Resources::Invoice.new()
-        @doc = SKApi::Resources::Invoice.new(:client_id => @client.id,
-                                          :line_items => [{ :position=>1, :description => 'Pork Chops', :quantity => 12, :price_single =>'10.00' }] )
-    @doc.save.should be_true
-#    @doc.title = 'A Document from the API'
-#    @doc.client_id = @client.id
-#    @doc.save
-#    @doc.errors.full_messages.should == 'adfd'
+    @doc = SKApi::Resources::Invoice.new()
+    @doc.title = 'A Document from the API'
+    @doc.client_id = @client.id
     @doc.save.should be_true
   end
 
   after :all do
-    #delete test doc
-    @doc.destroy
+    delete_test_data(@doc, @client)
+  end
+
+  it "should find a doc" do
+    doc = SKApi::Resources::Invoice.find(@doc.id)
+    doc.title.should == @doc.title
+  end
+end
+
+describe SKApi::Resources::Invoice, "a new invoice" do
+
+  before :all do
+    @client = SKApi::Resources::Client.new(:organisation=>'Invoice API-Tester')
+    @client.save.should be_true
+  end
+  after :all do
     @client.destroy
-    lambda {
-      doc = SKApi::Resources::Invoice.find(@doc.id)
-    }.should raise_error(ActiveResource::ResourceNotFound)
-    lambda {
-      client = SKApi::Resources::Client.find(@client.id)
-    }.should raise_error(ActiveResource::ResourceNotFound)
   end
 
   it "should create a doc" do
-    @doc.errors.should be_empty
-    @doc.new?.should be_false
+    doc = SKApi::Resources::Invoice.new()
+    doc.title = 'A Document from the API'
+    doc.client_id = @client.id
+    doc.save
+    doc.errors.should be_empty
+    doc.new?.should be_false
+    doc.destroy
   end
 
   it "should fail create a doc" do
@@ -42,34 +48,36 @@ describe SKApi::Resources::Invoice, "in general" do
     doc.errors.on(:client_id).should == "can't be blank"
   end
 
-  it "should find a doc" do
-    doc = SKApi::Resources::Invoice.find(@doc.id)
-    doc.title.should == @doc.title
+end
+
+describe SKApi::Resources::Invoice, "Edit an invoice" do
+
+  before :all do
+    #setup test doc to work with
+    # create client
+    @client = SKApi::Resources::Client.new(:organisation=>'Invoice API-Tester')
+    @client.save.should be_true
+    @doc = SKApi::Resources::Invoice.new()
+    @doc.title = 'A Document from the API'
+    @doc.client_id = @client.id
+    @doc.save.should be_true
   end
 
-  it "should validate raw json object with schema" do
-    doc = SKApi::Resources::Invoice.find(@doc.id)
-#    doc.number.should=='23'
-    # convert to json and read raw without activeresource assigning classes
-    json = doc.to_json    
-    obj = Rufus::Json.decode(json)
-    lambda {
-      JSON::Schema.validate(obj,  SKApi::Resources::Invoice.schema)
-    }.should_not raise_error
+  after :all do
+    delete_test_data(@doc, @client)
   end
 
   it "should edit a doc" do
-#    @doc.lock_version.should == 0 # dont work cause doc is saved twice, for recalc of totals
     old_lock_version = @doc.lock_version
     @doc.notes_before = 'You will recieve the amout of:'
     @doc.notes_before = 'Payment made to you bank Account'
     @doc.title = 'Changed doc title'
-    
+
     @doc.save.should be_true
     @doc.lock_version.should > old_lock_version # because save returns the data
   end
 
-  it "should fail edit a doc" do
+  it "should fail edit without a client" do
     @doc.client_id = ''
     @doc.save.should == false
     @doc.errors.count.should == 1
@@ -89,11 +97,7 @@ describe SKApi::Resources::Invoice, "with line items" do
   end
 
   after :all do
-    @client.destroy #also destroys all docs
-#    @doc.destroy
-    lambda {
-      doc = SKApi::Resources::Invoice.find(@doc.id)
-    }.should raise_error(ActiveResource::ResourceNotFound)
+    delete_test_data(@doc, @client)
   end
 
   it "should create a line item" do
@@ -115,7 +119,5 @@ describe SKApi::Resources::Invoice, "with line items" do
     @doc.save
     @doc.line_items.length.should == 2
     @doc.price_total.should == 220.0
-#    @doc.line_items[0].zip = '40001'
-#    @doc.line_items.[1].zip.should == '40001'
   end
-end
+end

data/spec/spec_helper.rb

@@ -2,11 +2,23 @@ require 'rubygems'
 require 'spec'
 require "#{File.dirname(__FILE__)}/../lib/sk_api"
 
-##
+
+def delete_test_data(doc, client)
+  doc.destroy
+  client.destroy
+  lambda {
+    doc = SKApi::Resources::Invoice.find(doc.id)
+  }.should raise_error(ActiveResource::ResourceNotFound)
+  lambda {
+    client = SKApi::Resources::Client.find(client.id)
+  }.should raise_error(ActiveResource::ResourceNotFound)
+end
+
 SKApi::CONNECTION = {
     :site => "http://demo.salesking.local:3000/api/",
     :user => "demo@salesking.eu",
     :password => "demo",
     :format => :json
   } unless defined?(SKApi::CONNECTION)
-SKApi::Resources::Base.set_connection(SKApi::CONNECTION)
+SKApi::Resources::Base.set_connection(SKApi::CONNECTION)
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Georg Leciejewski
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 +01:00
+date: 2010-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency