sk-api 1.1.0 → 1.1.1

data/spec/resources/client_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe SKApi::Resources::Client, "in general" do
 
@@ -52,28 +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 == "Organisation or lastname must be present."
-  end
-
-  it "should validate raw json object with schema" do
-    client = SKApi::Resources::Client.find(@client.id)
-    # convert to json and read raw without activeresource assigning classes
-    json = client.to_json
-    obj = ActiveSupport::JSON.decode(json)
-#     puts obj['client']['organisation']
-    lambda {
-      JSON::Schema.validate(obj['client'],  SKApi::Resources::Client.schema)
-    }.should_not raise_error
-  end
-
-  it "should validate raw json object with to_hash_with_schema" do
-    client = SKApi::Resources::Client.find(@client.id)
-    # convert to json and read raw without activeresource assigning classes
-    hash_obj =  SKApi::Resources::Client.to_hash_from_schema(client)
-#    hash_obj.should == ''
-    lambda {
-      JSON::Schema.validate(hash_obj['client'],  SKApi::Resources::Client.schema)
-    }.should_not raise_error
+    @client.errors.full_messages.should == ["Organisation or lastname must be present."]
   end
 
 end

data/spec/resources/credit_note_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe SKApi::Resources::CreditNote, "in general" do
 
@@ -30,28 +30,12 @@ describe SKApi::Resources::CreditNote, "in general" do
     @doc.notes_before.should_not be_empty
     @doc.new?.should be_false
   end
- 
-  it "should fail create a doc" do
-    doc = SKApi::Resources::CreditNote.new()
-    doc.save.should == false
-    doc.errors.count.should == 1
-    doc.errors.on(:client_id).should == "can't be blank"
-  end
 
   it "should find a doc" do
     doc = SKApi::Resources::CreditNote.find(@doc.id)
     doc.title.should == @doc.title
   end
 
-  it "should validate raw json object with schema" do
-    doc = SKApi::Resources::CreditNote.find(@doc.id)
-    # convert to json and read raw without activeresource assigning classes
-    json = doc.to_json    
-    obj = ActiveSupport::JSON.decode(json)
-    lambda {
-      JSON::Schema.validate(obj['credit_note'],  SKApi::Resources::CreditNote.schema)
-    }.should_not raise_error
-  end
 
   it "should edit a doc" do
 #    @doc.lock_version.should == 0 # dont work cause doc is saved twice, for recalc of totals
@@ -59,17 +43,11 @@ describe SKApi::Resources::CreditNote, "in general" do
     @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
-    @doc.client_id = ''
-    @doc.save.should == false
-    @doc.errors.count.should == 1
-    @doc.errors.on(:client_id).should == "can't be blank"
-  end
 end
 
 describe SKApi::Resources::CreditNote, "with line items" do

data/spec/resources/invoice_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe SKApi::Resources::Invoice, "in general" do
 
@@ -55,13 +55,6 @@ describe SKApi::Resources::Invoice, "a new invoice" do
     doc.destroy
   end
 
-  it "should fail create a doc" do
-    doc = SKApi::Resources::Invoice.new()
-    doc.save.should == false
-    doc.errors.count.should == 1
-    doc.errors.on(:client_id).should == "can't be blank"
-  end
-
 end
 
 describe SKApi::Resources::Invoice, "Edit an invoice" do
@@ -94,12 +87,6 @@ describe SKApi::Resources::Invoice, "Edit an invoice" do
     @doc.notes_before.should == 'You will recieve the amout of:'
   end
 
-  it "should fail edit without a client" do
-    @doc.client_id = ''
-    @doc.save.should == false
-    @doc.errors.count.should == 1
-    @doc.errors.on(:client_id).should == "can't be blank"
-  end
 end
 
 describe SKApi::Resources::Invoice, "with line items" do

data/spec/resources/product_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe SKApi::Resources::Product, "in general" do
 
@@ -28,11 +28,11 @@ describe SKApi::Resources::Product, "in general" do
     product.errors.count.should == 1
     product.errors.full_messages.should ==  ["Name can't be blank"]
   end
-  
-  it "should fail create a product without price" do
-    product = SKApi::Resources::Product.new(:name => 'No brain')
-    product.save.should == false
-    product.errors.full_messages.should ==  ["Price can't be blank"]
+
+  it "should fail create a product with empty price" do
+    product = SKApi::Resources::Product.new(:name => 'No brain', :price =>' ')
+    product.save.should be_false
+    product.errors.full_messages.should ==  ["Price can't be blank", "Price is not a number"]
   end
 
   it "should find a product by id" do
@@ -51,25 +51,7 @@ describe SKApi::Resources::Product, "in general" do
     @product.name = ''
     @product.save.should == false
     @product.errors.count.should == 1
-    @product.errors.on(:name).should ==  "can't be blank"
+    @product.errors.full_messages.should ==  ["Name can't be blank"]
   end
 
-  it "should validate raw json object with schema" do
-    product = SKApi::Resources::Product.find(@product.id)
-    # convert to json and read raw without activeresource assigning classes
-    json = product.to_json
-    obj = ActiveSupport::JSON.decode(json)
-    lambda {
-      JSON::Schema.validate(obj['product'],  SKApi::Resources::Product.schema)
-    }.should_not raise_error
-  end
-
-  it "should validate raw json object with to_hash_with_schema" do
-    product = SKApi::Resources::Product.find(@product.id)
-    # convert to json and read raw without activeresource assigning classes
-    hash_obj =  SKApi::Resources::Product.to_hash_from_schema(product)
-    lambda {
-      JSON::Schema.validate(hash_obj['product'],  SKApi::Resources::Product.schema)
-    }.should_not raise_error
-  end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require "#{File.dirname(__FILE__)}/../lib/sk_api"
-require File.dirname(__FILE__) + '/../vendor/jsonschema-1.0.0/lib/jsonschema'
 
 puts "Testing with ActiveResource Version: #{ActiveResource::VERSION::STRING}. Make sure this matches the version in your app. .. Yes this sucks!"
 
@@ -20,6 +19,9 @@ SKApi::CONNECTION = {
     :site => "http://demo.salesking.local:3000/api/",
     :user => "demo@salesking.eu",
     :password => "demo",
+    #:site => "https://demo.dev.salesking.eu/api/",
+    #:user => "demo@salesking.eu",
+    #:password => "",
     :format => :json
   } unless defined?(SKApi::CONNECTION)
 SKApi::Resources::Base.set_connection(SKApi::CONNECTION)

data/spec/utils/field_map_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe SKApi::Utils::FieldMap do
 
@@ -8,14 +8,14 @@ describe SKApi::Utils::FieldMap do
     @map = SKApi::Utils::FieldMap.new(@loc_obj, @rem_obj, map_hash)
   end
 
-  it "should create a mapping" do    
+  it "should create a mapping" do
     @map.outdated?.should be_false # both objects are empty
   end
 
-  it "should find outdated fields" do      
+  it "should find outdated fields" do
     @loc_obj.firstname = 'theo'
     @map.outdated?.should be_true
-    @map.outdated.first[:loc_key].should == :firstname    
+    @map.outdated.first[:loc_key].should == :firstname
   end
 
   it "should update outdated remote fields" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sk-api
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Georg Leciejewski
@@ -15,13 +15,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +01:00
-default_executable: 
+date: 2010-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
+  version_requirements: *id001
+  prerelease: false
+  name: activeresource
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
+  prerelease: false
+  name: rdoc
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  prerelease: false
   name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: simplecov
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,8 +84,25 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id005
+  prerelease: false
+  name: xml-simple
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id001
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  version_requirements: *id006
+  prerelease: false
+  name: rake
 description: Interact with SalesKing
 email: gl@salesking.eu
 executables: []
@@ -42,12 +113,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
 - MIT-LICENSE
 - Manifest
 - README.rdoc
 - Rakefile
-- VERSION
-- init.rb
 - lib/patches/README
 - lib/patches/ar2/base.rb
 - lib/patches/ar2/validations.rb
@@ -63,6 +133,7 @@ files:
 - lib/sk_api.rb
 - lib/utils/field_map.rb
 - lib/utils/serializer.rb
+- lib/version.rb
 - sk-api.gemspec
 - spec/resources/client_spec.rb
 - spec/resources/credit_note_spec.rb
@@ -70,19 +141,12 @@ files:
 - spec/resources/product_spec.rb
 - spec/spec_helper.rb
 - spec/utils/field_map_spec.rb
-- tasks/sk_api_tasks.rake
-- vendor/jsonschema-1.0.0/README.rdoc
-- vendor/jsonschema-1.0.0/Rakefile
-- vendor/jsonschema-1.0.0/lib/jsonschema.rb
-- vendor/jsonschema-1.0.0/ruby-jsonschema.gemspec
-- vendor/jsonschema-1.0.0/test/jsonschema_test.rb
-has_rdoc: true
 homepage: http://github.com/salesking/sk-api
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -106,14 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Interact with SalesKing
-test_files: 
-- spec/resources/client_spec.rb
-- spec/resources/credit_note_spec.rb
-- spec/resources/invoice_spec.rb
-- spec/resources/product_spec.rb
-- spec/spec_helper.rb
-- spec/utils/field_map_spec.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/init.rb

@@ -1 +0,0 @@
-require "#{File.dirname(__FILE__)}/lib/sk_api"

data/tasks/sk_api_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :sk_api_base do
-#   # Task goes here
-# end

data/vendor/jsonschema-1.0.0/README.rdoc

@@ -1,94 +0,0 @@
-= Ruby/jsonschema
-
-* http://github.com/Constellation/jsonchema
-
-== DESCRIPTION:
-
-json schema library ruby porting
-from http://code.google.com/p/jsonschema/
-
-== SYNOPSIS:
-ruby code
-  require 'jsonschema'
-  schema = {
-    "type" => "object",
-     "properties" => {
-      "prop01" => {
-        "type" => "number",
-        "maximum" => 10
-      },
-      "prop02" => {
-        "type" => "integer",
-        "maximum" => 20
-      }
-    }
-  }
-  data = {
-    "prop01"=> 5,
-    "prop02"=> 10
-  }
-  JSON::Schema.validate(data, schema)
-
-if you have json library
-  require 'json'
-  require 'jsonschema'
-  schema = File.open("path/to/schema.json", "rb"){|f| JSON.parse(f.read)}
-  data   = File.open("path/to/data.json",   "rb"){|f| JSON.parse(f.read)}
-  JSON::Schema.validate(data, schema)
-
-== INSTALL:
-
-  gem source -a http://gemcutter.org
-  sudo gem install jsonschema
-
-== LICENSE:
-
-Ruby/jsonschema
-(The MIT License)
-
-Copyright (c) 2009 Constellation
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-jsonschema
-http://code.google.com/p/jsonschema/
-(The MIT License)
-
-Copyright (c) 2008 Ian Lewis, Yusuke Muraoka
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-