lws 0.4.2 → 6.1.0.beta1

data/test/fixtures/auth.yml

@@ -16,7 +16,10 @@ auth:
       user_id: null
 
   /tokens/does_not_exist:
-    default: {}
+    default:
+      errors:
+        base:
+          - "Not found (HTTP 404)"
 
   /tokens:
     default:

data/test/fixtures/permissions.yml

@@ -8,10 +8,6 @@ auth:
             value: "true"
           - key: configuration.write
             value: "true"
-          - key: task.read
-            value: "true"
-          - key: task.write
-            value: "true"
     generic:
       - id: 1
         app_key: test

data/test/generic_test.rb

@@ -28,20 +28,3 @@ class TestGenericConfiguration < MiniTest::Test
   #end
 
 end
-
-class TestGenericTask < MiniTest::Test
-
-  # Generic class needs to be accessed under some kind of app
-  include LWS::Auth
-
-  def setup
-    @task = Task.all.first
-  end
-
-  def test_valid_task
-    refute_nil(@task)
-    assert_instance_of(Task, @task)
-    refute_nil(@task.id)
-  end
-
-end

data/test/json_parser_test.rb

@@ -0,0 +1,57 @@
+#
+# Copyright © 2016 LeftClick B.V.
+#
+# This software is property of LeftClick B.V. and cannot be redistributed
+# and/or modified without permission.  The software or any of its parts
+# cannot be used for any other purposes than the LeftClick services and
+# only during a valid license subscription.  For more information, please
+# contact LeftClick B.V. at:  Geldropseweg 8B, 5731 SG Mierlo, The
+# Netherlands, info@leftclick.eu, +31492-782120.
+
+
+require "test_helper"
+
+class TestJSONParser < MiniTest::Test
+
+  include WebMock::API
+
+  def setup
+    WebMock.enable!
+    company = { id: "correct",
+                country: "NL",
+                # ...
+              }
+
+    full_uri = LWS::Auth.api.url_prefix.dup
+    full_uri.path = "/companies/broken"
+    stub_request(:get, full_uri.to_s).to_return(body: "{}invalid json")
+    full_uri.path = "/companies/correct"
+    stub_request(:get, full_uri.to_s)
+      .to_return(body: MultiJson.dump(company))
+    stub_request(:put, full_uri.to_s)
+      .to_return(body: MultiJson.dump(company.merge(errors: { ticket: ["is an invalid field"] })))
+  end
+
+  def teardown
+    WebMock.disable!
+  end
+
+  def test_broken_json
+    assert_raises MultiJson::ParseError do
+      company = LWS::Auth::Company.find("broken")
+    end
+  end
+
+  def test_correct_json
+    company = LWS::Auth::Company.find("correct")
+    assert_equal "correct", company.id
+  end
+
+  def test_correct_json_with_errors
+    company = LWS::Auth::Company.find("correct")
+    company.ticket = "unknown attribute"
+    company.save
+    assert_equal ["Ticket is an invalid field"], company.errors.to_a
+  end
+
+end

data/test/logger_test.rb

@@ -21,10 +21,11 @@ class TestLogger < MiniTest::Test
     # Configure the logger and enable HTTP request and JSON data debugging
     reconfigure(logger: logger,
                 http_debug: true,
+                http_debug_headers: true,
                 json_debug: true)
 
     # Perform a query to have any log entries
-    LWS::Auth::Task.all.first
+    LWS::Auth::Token.all.first
     refute_nil(log.string)
 
     # Restore the token

data/test/maps_test.rb

@@ -32,7 +32,7 @@ class TestMapsMap < MiniTest::Test
 
 end
 
-class TestMapsMap < MiniTest::Test
+class TestMapsMarker < MiniTest::Test
 
   include LWS::Maps
 
@@ -54,3 +54,24 @@ class TestMapsMap < MiniTest::Test
   end
 
 end
+
+class TestMapsSource < MiniTest::Test
+
+  include LWS::Maps
+
+  def setup
+    @source = Source.all.first
+  end
+
+  def test_valid_source
+    refute_nil(@source)
+    assert_instance_of(Source, @source)
+    refute_nil(@source.id)
+  end
+
+  def test_valid_source_associations
+    # FIXME: Not implemented yet
+    #assert_instance_of(Map, @source.maps.first)
+  end
+
+end

data/test/presence_test.rb

@@ -11,44 +11,44 @@
 
 require "test_helper"
 
-class TestPresencePerson < MiniTest::Test
+class TestPresenceLocation < MiniTest::Test
 
   include LWS::Presence
 
   def setup
-    @person = Person.all.first
+    @location = Location.all.first
   end
 
-  def test_valid_person
-    refute_nil(@person)
-    assert_instance_of(Person, @person)
-    refute_nil(@person.id)
+  def test_valid
+    refute_nil(@location)
+    assert_instance_of(Location, @location)
+    refute_nil(@location.id)
   end
 
-  def test_valid_person_associations
-    assert_instance_of(LWS::Auth::Company, @person.company)
-    assert_instance_of(Location, @person.location)
+  def test_valid_associations
+    assert_instance_of(LWS::Auth::Company, @location.company)
+    assert_instance_of(Person, @location.people.first)
   end
 
 end
 
-class TestPresenceLocation < MiniTest::Test
+class TestPresencePerson < MiniTest::Test
 
   include LWS::Presence
 
   def setup
-    @location = Location.all.first
+    @person = Person.all.first
   end
 
-  def test_valid_location
-    refute_nil(@location)
-    assert_instance_of(Location, @location)
-    refute_nil(@location.id)
+  def test_valid
+    refute_nil(@person)
+    assert_instance_of(Person, @person)
+    refute_nil(@person.id)
   end
 
-  def test_valid_location_associations
-    assert_instance_of(LWS::Auth::Company, @location.company)
-    assert_instance_of(Person, @location.people.first)
+  def test_valid_associations
+    assert_instance_of(LWS::Auth::Company, @person.company)
+    assert_instance_of(Location, @person.location)
   end
 
 end

data/test/setup_test.rb

@@ -35,6 +35,11 @@ class TestSetup < MiniTest::Test
     end
     assert_equal(LWS.config.environment, :production)
 
+    with_env("LC_LWS_API_TOKEN" => "test-token") do
+      reconfigure
+    end
+    assert_equal(LWS.config.api_token, "test-token")
+
     # Restore the configuration
     reconfigure
   end

data/test/stubbing_test.rb

@@ -31,8 +31,10 @@ class TestStubbing < MiniTest::Test
   end
 
   def test_working_stubbing_with_status
-    LWS.stubbing.replace(:get, :auth, "/tokens/does_not_exist", :default, 403)
-    assert_nil LWS::Auth::Token.find("does_not_exist")
+    LWS.stubbing.replace(:get, :auth, "/tokens/does_not_exist", :default, 404)
+    assert_raises Spyke::ResourceNotFound do
+      LWS::Auth::Token.find("does_not_exist")
+    end
   end
 
   def test_replace_stub

data/test/test_helper.rb

@@ -48,8 +48,9 @@ def reconfigure(options = {})
     config.api_token = ENV["LC_LWS_TEST_TOKEN"]
     if ENV["LC_LWS_TEST_DEBUG"].present?
       config.logger = Logger.new($stdout)
-      config.http_debug = true
-      config.json_debug = true
+      config.http_debug = false
+      config.http_debug_headers = false
+      config.json_debug = false
     end
     config.environment = :development
 

data/test/ticket_test.rb

@@ -11,29 +11,47 @@
 
 require "test_helper"
 
-class TestTicketTicket < MiniTest::Test
+# FIXME: Cannot reach an attachment through the API yet
+#class TestTicketAttachment < MiniTest::Test
+#
+#  include LWS::Ticket
+#
+#  def setup
+#    @ticket = Ticket.find(1)
+#    @message = @ticket.messages.first
+#    @attachment = @message.attachments.first
+#  end
+#
+#  def test_valid
+#    refute_nil(@attachment)
+#    assert_instance_of(Attachment, @attachment)
+#    refute_nil(@attachment.id)
+#  end
+#
+#  def test_valid_associations
+#    assert_instance_of(Messsage, @attachment.message)
+#    assert_equal(@message, @attachment.message)
+#  end
+#
+#end
+
+class TestTicketGroup < MiniTest::Test
 
   include LWS::Ticket
 
   def setup
-    @ticket = Ticket.all.first
+    @group = Group.all.first
   end
 
-  def test_valid_ticket
-    refute_nil(@ticket)
-    assert_instance_of(Ticket, @ticket)
-    refute_nil(@ticket.id)
+  def test_valid
+    refute_nil(@group)
+    assert_instance_of(Group, @group)
+    refute_nil(@group.id)
   end
 
-  def test_valid_ticket_associations
-    assert_instance_of(LWS::Auth::Account, @ticket.account)
-    assert_instance_of(LWS::Auth::Account, @ticket.assignee)
-    assert_instance_of(LWS::Auth::Company, @ticket.company)
-    assert_instance_of(Group, @ticket.group)
-    assert_instance_of(Message, @ticket.messages.first)
-    # FIXME: Enable when tags are reachable through the API
-    #assert_instance_of(Tag, @ticket.tags.first)
-    assert_instance_of(LWS::Auth::Company, @ticket.owner)
+  def test_valid_associations
+    # FIXME: Not implemented yet
+    #assert_instance_of(Ticket, @group.tickets.first)
   end
 
 end
@@ -43,7 +61,7 @@ class TestTicketMessage < MiniTest::Test
   include LWS::Ticket
 
   def setup
-    @ticket = Ticket.all.first
+    @ticket = Ticket.find(1)
     # Messages only exist as child object of tickets
     @message = @ticket.messages.first
   end
@@ -56,60 +74,57 @@ class TestTicketMessage < MiniTest::Test
 
   def test_valid_message_associations
     assert_instance_of(LWS::Auth::Account, @message.account)
+    # FIXME: Cannot reach attachments through the API yet
+    #assert_instance_of(Attachment, @message.attachments.first)
     assert_instance_of(LWS::Auth::Company, @message.company)
-    assert_instance_of(Ticket, @message.ticket) 
+    assert_instance_of(Ticket, @message.ticket)
     assert_equal(@message.ticket, @ticket)
   end
 
 end
 
-class TestTicketAttachment < MiniTest::Test
-
-  include LWS::Ticket
-
-  # FIXME: Implement the tests once the attachments can be reached through
-  # the API
-
-end
-
-class TestTicketGroup < MiniTest::Test
+class TestTicketTag < MiniTest::Test
 
   include LWS::Ticket
 
   def setup
-    @group = Group.all.first
+    @tag = Tag.all.first
   end
 
-  def test_valid_group
-    refute_nil(@group)
-    assert_instance_of(Group, @group)
-    refute_nil(@group.id)
+  def test_valid_tag
+    refute_nil(@tag)
+    assert_instance_of(Tag, @tag)
+    refute_nil(@tag.id)
   end
 
-  def test_valid_message_associations
-    # FIXME: Implement this test once tickets of a group and associated
-    # accounts with a group can be reached through the API
+  def test_valid_tag_associations
+    assert_instance_of(Ticket, @tag.tickets.first)
   end
 
 end
 
-class TestTicketTag < MiniTest::Test
+class TestTicketTicket < MiniTest::Test
 
   include LWS::Ticket
 
   def setup
-    @tag = Tag.all.first
+    @ticket = Ticket.find(1)
   end
 
-  def test_valid_tag
-    refute_nil(@tag)
-    assert_instance_of(Tag, @tag)
-    refute_nil(@tag.id)
+  def test_valid_ticket
+    refute_nil(@ticket)
+    assert_instance_of(Ticket, @ticket)
+    refute_nil(@ticket.id)
   end
 
-  def test_valid_tag_associations
-    # FIXME: Enable when tags are reachable through the API
-    #assert_instance_of(Ticket, @ticket)
+  def test_valid_ticket_associations
+    assert_instance_of(LWS::Auth::Account, @ticket.account)
+    assert_instance_of(LWS::Auth::Account, @ticket.assignee)
+    assert_instance_of(LWS::Auth::Company, @ticket.company)
+    assert_instance_of(Group, @ticket.group)
+    assert_instance_of(Message, @ticket.messages.first)
+    assert_instance_of(LWS::Auth::Company, @ticket.owner)
+    assert_instance_of(Tag, @ticket.tags.first)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lws
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 6.1.0.beta1
 platform: ruby
 authors:
 - LeftClick B.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -45,21 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: her
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spyke
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -120,20 +134,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: her
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spyke
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: |-
   This library for Ruby provides access to the LeftClick
    web services/applications using a model-based structure that abstracts from API calls
@@ -224,6 +238,7 @@ files:
 - lib/lws.rb
 - lib/lws/auth.rb
 - lib/lws/corporate_website.rb
+- lib/lws/digital_signage.rb
 - lib/lws/generic.rb
 - lib/lws/maps.rb
 - lib/lws/presence.rb
@@ -235,9 +250,11 @@ files:
 - test/auth_test.rb
 - test/caching_test.rb
 - test/corporate_website_test.rb
+- test/digital_signage_test.rb
 - test/fixtures/auth.yml
 - test/fixtures/permissions.yml
 - test/generic_test.rb
+- test/json_parser_test.rb
 - test/logger_test.rb
 - test/maps_test.rb
 - test/presence_test.rb
@@ -260,9 +277,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -274,9 +291,11 @@ test_files:
 - test/auth_test.rb
 - test/caching_test.rb
 - test/corporate_website_test.rb
+- test/digital_signage_test.rb
 - test/fixtures/auth.yml
 - test/fixtures/permissions.yml
 - test/generic_test.rb
+- test/json_parser_test.rb
 - test/logger_test.rb
 - test/maps_test.rb
 - test/presence_test.rb