lws 7.1.1 → 7.2.1

data/test/http_caching_test.rb

@@ -0,0 +1,80 @@
+#
+# Copyright © 2016–2020 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:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
+
+
+require "test_helper"
+
+class TestHTTPCaching < MiniTest::Test
+
+  # Class used to check if data is read/written to or remove from the cache
+  class HTTPCacheTest
+
+    attr_reader :last_read_key
+    attr_reader :last_written_key, :last_written_value
+    attr_reader :last_deleted_key
+
+    def read(key)
+      @last_read_key = key
+      nil
+    end
+
+    def write(key, value)
+      @last_written_key = key
+      @last_written_value = value
+      nil
+    end
+
+    def delete(key)
+      @last_deleted_key = key
+      nil
+    end
+
+  end
+
+  def setup
+    @cache_mock = HTTPCacheTest.new
+
+    # Redo the LWS setup with an HTTP caching object
+    LWS.setup do |config|
+      config.api_token = ENV["LC_LWS_TEST_TOKEN"]
+      config.http_caching_object = @cache_mock
+      if ENV["LC_LWS_TEST_DEBUG"].present?
+        config.http_debug = true
+        config.http_debug_headers = true
+      end
+      config.environment = :development
+    end
+  end
+
+  def teardown
+    # Restore the configuration
+    reconfigure
+  end
+
+  def test_working_cache
+    assert_nil(@cache_mock.last_read_key)
+    assert_nil(@cache_mock.last_written_key)
+    assert_nil(@cache_mock.last_written_value)
+    assert_nil(@cache_mock.last_deleted_key)
+
+    new_configuration = LWS::Auth::Configuration.create(key: "test", value: "some_value")
+    refute_nil(@cache_mock.last_deleted_key)
+
+    _configurations = LWS::Auth::Configuration.where(key: "test").to_a
+    refute_nil(@cache_mock.last_read_key)
+    assert_equal(@cache_mock.last_read_key, @cache_mock.last_written_key)
+    refute_nil(@cache_mock.last_written_value)
+
+    old_key = @cache_mock.last_deleted_key.dup
+    new_configuration.destroy
+    refute_equal(old_key, @cache_mock.last_deleted_key)
+  end
+
+end

data/test/json_parser_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"

data/test/logger_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"

data/test/maps_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"
@@ -16,7 +16,7 @@ class TestMapsMap < MiniTest::Test
   include LWS::Maps
 
   def setup
-    @map = Map.all.first
+    @map = Map.find(1)
   end
 
   def test_valid_map
@@ -37,7 +37,7 @@ class TestMapsMarker < MiniTest::Test
   include LWS::Maps
 
   def setup
-    @map = Map.all.first
+    @map = Map.find(1)
     # Markers only exist as child objects of maps
     @marker = @map.markers.first
   end
@@ -60,7 +60,7 @@ class TestMapsSource < MiniTest::Test
   include LWS::Maps
 
   def setup
-    @source = Source.all.first
+    @source = Source.find(1)
   end
 
   def test_valid_source

data/test/presence_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"
@@ -35,6 +35,29 @@ class TestPresenceAppointment < MiniTest::Test
 
 end
 
+class TestPresenceJournal < MiniTest::Test
+  include LWS::Presence
+
+  def setup
+    @location = Location.find(1)
+    # Journals only exist as child objects of a location
+    @journal = @location.journals.first
+  end
+
+  def test_valid
+    refute_nil(@journal)
+    assert_instance_of(Journal, @journal)
+    refute_nil(@journal.id)
+  end
+
+  def test_valid_associations
+    assert_instance_of(LWS::Auth::Company, @journal.company)
+    assert_instance_of(Location, @journal.location)
+    assert_equal(@location, @journal.location)
+    assert_instance_of(Person, @journal.person)
+  end
+end
+
 class TestPresenceLocation < MiniTest::Test
 
   include LWS::Presence
@@ -165,7 +188,7 @@ class TestPresenceReader < MiniTest::Test
   include LWS::Presence
 
   def setup
-    @reader = Reader.all.first
+    @reader = Reader.find(1)
   end
 
   def test_valid

data/test/resource_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"
@@ -25,7 +25,7 @@ class TestResourceCollection < MiniTest::Test
   include LWS::Resource
 
   def setup
-    @collection = Collection.all.first # FIXME
+    @collection = Collection.find(1)
   end
 
   def test_valid
@@ -48,7 +48,7 @@ class TestResourceCollectionItem < MiniTest::Test
   include LWS::Resource
 
   def setup
-    @collection = Collection.where(includes: "items").first # FIXME
+    @collection = Collection.where(includes: "items").find(1)
     @collection_item = @collection.items.first
   end
 
@@ -70,7 +70,7 @@ class TestResourceFolder < MiniTest::Test
   include LWS::Resource
 
   def setup
-    @folder = Folder.all.first
+    @folder = Folder.find(1)
   end
 
   def test_valid

data/test/setup_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"
@@ -71,7 +71,6 @@ class TestSetup < MiniTest::Test
 
   def test_load_config_files
     orig_config = LWS.config.dup
-
     reconfigure do |config|
       assert config.load_config_file(File.join(@test_config_dir, "empty.yml"))
     end
@@ -113,6 +112,20 @@ class TestSetup < MiniTest::Test
     assert_equal(true, LWS.config.http_debug)
     assert_equal(true, LWS.config.http_debug_headers)
     assert_equal(true, LWS.config.json_debug)
+
+    with_env("LC_LWS_ENV" => "production") do
+      reconfigure do |config|
+        assert config.load_config_file(File.join(@test_config_dir, "empty.yml"),
+                                       :development)
+      end
+      assert_equal(:development, LWS.config.environment)
+    end
+
+    reconfigure do |config|
+      assert config.load_config_file(File.join(@test_config_dir, "switch_env.yml"),
+                                     :development)
+    end
+    assert_equal(:development, LWS.config.environment)
   end
 
 end

data/test/stubbing_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"

data/test/support/with_env.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 class Minitest::Test

data/test/test_helper.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require 'simplecov'
@@ -49,14 +49,18 @@ raise "Test token not set" if ENV["LC_LWS_TEST_TOKEN"].blank?
 
 def reconfigure(options = {}, &block)
   LWS.setup do |config|
-    config.api_token = ENV["LC_LWS_TEST_TOKEN"]
+    if ENV["LC_LWS_API_TOKEN"].blank?
+      config.api_token = ENV["LC_LWS_TEST_TOKEN"]
+    end
     if ENV["LC_LWS_TEST_DEBUG"].present?
       config.logger = Logger.new($stdout)
       config.http_debug = true
       config.http_debug_headers = false
       config.json_debug = true
     end
-    config.environment = :development
+    if ENV["LC_LWS_ENV"].blank?
+      config.environment = :development
+    end
 
     # Override the config with the given options.
     options.each do |key, value|

data/test/ticket_test.rb

@@ -1,12 +1,12 @@
 #
-# Copyright © 2016 LeftClick B.V.
+# Copyright © 2016–2020 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.
+# contact LeftClick B.V. at:  Schootense Dreef 20A, 5708 HZ Helmond, The
+# Netherlands, info@leftclick.eu, +3185-4444-004.
 
 
 require "test_helper"
@@ -40,7 +40,7 @@ class TestTicketGroup < MiniTest::Test
   include LWS::Ticket
 
   def setup
-    @group = Group.all.first
+    @group = Group.find(1)
   end
 
   def test_valid
@@ -88,7 +88,7 @@ class TestTicketTag < MiniTest::Test
   include LWS::Ticket
 
   def setup
-    @tag = Tag.all.first
+    @tag = Tag.find(1)
   end
 
   def test_valid_tag

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lws
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.1
 platform: ruby
 authors:
 - LeftClick B.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday-http-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,7 @@ files:
 - test/fixtures/auth.yml
 - test/fixtures/permissions.yml
 - test/generic_test.rb
+- test/http_caching_test.rb
 - test/json_parser_test.rb
 - test/logger_test.rb
 - test/maps_test.rb
@@ -290,33 +305,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: LeftClick web services library for Ruby
 test_files:
-- test/support/with_env.rb
-- test/json_parser_test.rb
-- test/test_helper.rb
-- test/setup_test.rb
-- test/ticket_test.rb
-- test/api_token_middleware_test.rb
-- test/stubbing_test.rb
-- test/presence_test.rb
-- test/digital_signage_test.rb
+- test/http_caching_test.rb
 - test/generic_test.rb
-- test/logger_test.rb
-- test/auth_test.rb
-- test/resource_test.rb
-- test/maps_test.rb
+- test/caching_test.rb
+- test/api_token_middleware_test.rb
 - test/corporate_website_test.rb
-- test/config/tokens.yml
+- test/ticket_test.rb
+- test/stubbing_test.rb
+- test/setup_test.rb
+- test/config/invalid.yml
+- test/config/full.yml
 - test/config/empty.yml
 - test/config/endpoints.yml
-- test/config/invalid.yml
 - test/config/switch_env.yml
-- test/config/full.yml
-- test/caching_test.rb
-- test/fixtures/auth.yml
+- test/config/tokens.yml
+- test/json_parser_test.rb
+- test/presence_test.rb
+- test/digital_signage_test.rb
+- test/test_helper.rb
+- test/maps_test.rb
+- test/support/with_env.rb
+- test/resource_test.rb
+- test/auth_test.rb
+- test/logger_test.rb
 - test/fixtures/permissions.yml
+- test/fixtures/auth.yml