rspec-openhab-scripting 0.0.13-java → 0.0.16-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66498207277243867a72d4dceb321643f804b5464682a220aa0239eae17d3376
-  data.tar.gz: f277b25e8dc7759511c2bfa3adbd6664802d271cb8e4268d65e537750fe12144
+  metadata.gz: a5dd7ea9915aa3edecf86f75d7331bfe77ad3fbbbee4c278fd130895e4bc1e6c
+  data.tar.gz: 489db2879bf94009c027fcbb87572ae5b3834d31fab17f473cddc2fdecfebdfd
 SHA512:
-  metadata.gz: d5b3d43560e314ab820bde6efc5f74d12ee7bbcea3f35ea9b3d760fe2e073a19505fc06031f60197b48f7658e3228f035b477f7e276919515b9c846866c45ca3
-  data.tar.gz: fc7a6a2a340f0b59e165ed3397ab6e94d404f8710d85b0b03d01fbe9fb60db2e5fd9339a2be8a00be11998177a3a20c272e4d89475ab5bd16a01848138c5eafc
+  metadata.gz: 967d33cd26a809179324637df7ebb9243ec901ae6c75aaa97a1615a6f699082bb83050727502c326bcf85732f86521f93ce253877306d8e6cf86b4ed84030708
+  data.tar.gz: 375c3ebb1c64176b3da00a8489b8b9574e5636d767a2cb981100dc3b6b3128cbf23fc8b7ab9998ed3b7154a9d0754be6f349d3711ef326e7714ec360cac89732

data/lib/rspec/openhab/core/item_proxy.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module Core
+    class ItemProxy
+      @proxies = {}
+
+      class << self
+        # ensure each item only has a single proxy, so that
+        # expect(item).to receive(:method) works
+        def new(item)
+          @proxies.fetch(item.name) do
+            @proxies[item.name] = super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/openhab/core/mocks/persistence_service.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+module RSpec
+  module OpenHAB
+    module Core
+      module Mocks
+        class PersistenceService
+          include org.openhab.core.persistence.ModifiablePersistenceService
+          include Singleton
+
+          class HistoricItem
+            include org.openhab.core.persistence.HistoricItem
+
+            attr_reader :timestamp, :state, :name
+
+            def initialize(timestamp, state, name)
+              @timestamp = timestamp
+              @state = state
+              @name = name
+            end
+          end
+
+          attr_reader :id
+
+          def initialize
+            @id = "default"
+            reset
+          end
+
+          def reset
+            @data = Hash.new { |h, k| h[k] = [] }
+          end
+
+          def store(item, date = nil, state = nil)
+            date = nil if date.is_a?(String) # alias overload
+            state ||= item.state
+            date ||= ZonedDateTime.now
+
+            new_item = HistoricItem.new(date, state, item.name)
+
+            item_history = @data[item.name]
+
+            insert_index = item_history.bsearch_index do |i|
+              i.timestamp.compare_to(date).positive?
+            end
+
+            return item_history << new_item unless insert_index
+
+            return item_history[insert_index].state = state if item_history[insert_index].timestamp == date
+
+            item_history.insert(insert_index, new_item)
+          end
+
+          def remove(filter)
+            query_internal(filter) do |item_history, index|
+              historic_item = item_history.delete_at(index)
+              @data.delete(historic_item.name) if item_history.empty?
+            end
+          end
+
+          def query(filter)
+            result = []
+
+            query_internal(filter) do |item_history, index|
+              result << item_history[index]
+
+              return result if filter.page_number.zero? && result.length == filter.page_size && filter.item_name
+            end
+
+            result.sort_by! { |hi| hi.timestamp.to_instant.to_epoch_milli } unless filter.item_name
+
+            unless filter.page_number.zero?
+              result = result.slice(filter.page_number * filter.page_size, filter.page_size)
+            end
+
+            result
+          end
+
+          def get_item_info # rubocop:disable Naming/AccessorMethodName must match Java interface
+            @data.map do |(n, entries)|
+              [n, entries.length, entries.first.timestamp, entries.last.timestamp]
+            end.to_set
+          end
+
+          def get_default_strategies # rubocop:disable Naming/AccessorMethodName must match Java interface
+            [org.openhab.core.persistence.strategy.PersistenceStrategy::Globals::CHANGE]
+          end
+
+          private
+
+          def query_internal(filter, &block)
+            if filter.item_name
+              return unless @data.key?(filter.item_name)
+
+              query_item_internal(@data[filter.item_name], filter, &block)
+            else
+              @data.each_value do |item_history|
+                query_item_internal(item_history, filter, &block)
+              end
+            end
+          end
+
+          def query_item_internal(item_history, filter)
+            first_index = 0
+            last_index = item_history.length
+
+            if filter.begin_date
+              first_index = item_history.bsearch_index do |i|
+                i.timestamp.compare_to(filter.begin_date).positive?
+              end
+              return if first_index.nil?
+            end
+
+            if filter.end_date
+              last_index = item_history.bsearch_index do |i|
+                i.timestamp.compare_to(filter.end_date).positive?
+              end
+              return if last_index.zero?
+
+              last_index ||= item_history.length
+            end
+
+            range = first_index...last_index
+
+            operator = filter.operator.symbol
+            operator = "==" if operator == "="
+
+            block = lambda do |i|
+              next if filter.state && !item_history[i].state.send(operator, filter.state)
+
+              yield(item_history, i)
+            end
+
+            if filter.ordering == filter.class::Ordering::DESCENDING
+              range.reverse_each(&block)
+            else
+              range.each(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/openhab/dsl/imports.rb

@@ -400,6 +400,17 @@ module OpenHAB
           el = org.openhab.core.io.monitor.internal.EventLogger.new(rs)
           em.add_event_subscriber(el)
           el.on_ready_marker_added(nil)
+
+          # set up persistence
+          psr = org.openhab.core.persistence.internal.PersistenceServiceRegistryImpl.new
+          org.openhab.core.persistence.extensions.PersistenceExtensions.new(psr)
+          psr.activate("default" => "default")
+          ps = RSpec::OpenHAB::Core::Mocks::PersistenceService.instance
+          psr.add_persistence_service(ps)
+
+          pm = org.openhab.core.persistence.internal.PersistenceManagerImpl.new(nil, ir, sc, rs)
+          pm.add_persistence_service(ps)
+          pm.on_ready_marker_added(nil)
         end
       end
     end

data/lib/rspec/openhab/dsl/rules/triggers/watch.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module DSL
+    module Rules
+      module Triggers
+        def watch(path, glob: "*", for: %i[created deleted modified], attach: nil); end
+      end
+    end
+  end
+end

data/lib/rspec/openhab/hooks.rb

@@ -10,9 +10,11 @@ RSpec.configure do |config|
       end
     end
   end
+
   config.after do
     OpenHAB::DSL::Timers.timer_manager.cancel_all
     Timecop.return
     restore_autoupdate_items
+    RSpec::OpenHAB::Core::Mocks::PersistenceService.instance.reset
   end
 end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.13"
+    VERSION = "0.0.16"
   end
 end

data/lib/rspec-openhab-scripting.rb

@@ -42,9 +42,11 @@ maven_require do
   require "jar org.openhab.core.bundles, org.openhab.core.model.core, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.item, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.script, #{openhab_version}"
+  require "jar org.openhab.core.bundles, org.openhab.core.persistence, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.semantics, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.thing, #{openhab_version}"
 end
+java_import org.openhab.core.persistence.extensions.PersistenceExtensions
 
 require "openhab/version"
 
@@ -64,6 +66,7 @@ require "rspec/openhab/core/logger"
 # during testing, we don't want "regular" output from rules
 OpenHAB::Log.logger("org.openhab.automation.jruby.runtime").level = :warn
 OpenHAB::Log.logger("org.openhab.automation.jruby.logger").level = :warn
+require "rspec/openhab/core/mocks/persistence_service"
 require "openhab/dsl/imports"
 OpenHAB::DSL::Imports.api = api
 OpenHAB::DSL::Imports.import_presets
@@ -73,8 +76,10 @@ require "openhab"
 require "rspec/openhab/actions"
 require "rspec/openhab/core/cron_scheduler"
 
-# override several timer methods
+# override several openhab-scripting methods
+require_relative "rspec/openhab/core/item_proxy"
 require_relative "rspec/openhab/dsl/timers/timer"
+require_relative "rspec/openhab/dsl/rules/triggers/watch"
 
 # RSpec additions
 require "rspec/core"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.16
 platform: java
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -189,12 +189,15 @@ files:
 - lib/rspec/openhab/actions.rb
 - lib/rspec/openhab/api.rb
 - lib/rspec/openhab/core/cron_scheduler.rb
+- lib/rspec/openhab/core/item_proxy.rb
 - lib/rspec/openhab/core/load_path.rb
 - lib/rspec/openhab/core/logger.rb
+- lib/rspec/openhab/core/mocks/persistence_service.rb
 - lib/rspec/openhab/core/openhab_setup.rb
 - lib/rspec/openhab/core/osgi.rb
 - lib/rspec/openhab/core/script_handling.rb
 - lib/rspec/openhab/dsl/imports.rb
+- lib/rspec/openhab/dsl/rules/triggers/watch.rb
 - lib/rspec/openhab/dsl/timers/timer.rb
 - lib/rspec/openhab/helpers.rb
 - lib/rspec/openhab/hooks.rb
@@ -242,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - jar ch.qos.logback, logback-classic, 1.2.9
-rubygems_version: 3.3.17
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Library testing OpenHAB ruby rules with rspec.