locomotive_wubook_plugin 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5d6c6828d7c446b2a73a2ccd4f1ffb5ff771a6
-  data.tar.gz: 78d588cbd959466f7ea3117e2fdd737cff2eef1f
+  metadata.gz: 8c8a215a611d26d0679b420ba54fd5a9dda53e79
+  data.tar.gz: 9439ac588ce891c63ac9b5fef40695c87a72373e
 SHA512:
-  metadata.gz: a66f644a2c60f7ff058b7feb2b4e8baac005aa8f53ecedd04f8de413feeed2a4f85eb92c48ac357220ef8946b708f2cb4e49c5ca2708b0ce256000669b9ca4b0
-  data.tar.gz: 0a8e3b23488214e9a2633f35bf44af66c62a2ede2f4f24394b3b9b9977b68a33d7a145e44c5839fde0133411a1be34ce8968b0687ed6372550219ada39635cdc
+  metadata.gz: 593c8f18db945eb5ab5ad5414401fafdae98de6a895a23649eb0dbaf08fa94aa8b2f39a1ea09a387e24913a572d5edbdeda3b44f14d5c5caee220601ab42bbee
+  data.tar.gz: 8d7cf8efa18344713011544ce3726141a3a5fb564ba4558dcf8bcab3ca38f14378e91235d2d4f4a54745723adef2b871e8257a9c7cd3d437897ed21dfe7387d4

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 
 gem 'rspec',     '~> 2.12'
 gem 'mocha',     '~> 0.13'
-gem 'wubook_wired', '~> 1.0'
+gem 'wubook_wired', '~> 1.0.0'

data/lib/locomotive/wubook/plugin/available_days_tag.rb

@@ -0,0 +1,62 @@
+require 'date'
+
+require 'wired'
+require 'locomotive_plugins'
+require_relative 'plugin_helper'
+
+module Locomotive
+  module WuBook
+    class AvailableDaysTag < ::Liquid::Tag
+      include PluginHelper
+      def initialize(tag_name, markup, tokens, context)
+        @options = {
+          room_ident: ''
+        }
+
+        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
+        super
+      end
+
+      def render(context)
+        @plugin_obj = context.registers[:plugin_object]
+        config = @plugin_obj.config
+
+        returned_string = "["
+
+        # Evaluate variables and use the return of the evaluation if it exists..
+        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
+        room_ident_evaluated = context[@options[:room_ident]]
+        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
+        ::Locomotive.log "**> AvailableDaysTag room_ident: #{@options[:room_ident]}"
+
+        today = Date.today
+        last_day = today.next_month(config['months_ahead'].to_i)
+
+        wired = Wired.new(config)
+        wired.aquire_token
+
+        room_data = request_room_data(wired, config['lcode'], @options[:room_ident], today, last_day)
+
+        # Create one entry for each day from now to then.. put a 1 if the day is available or 0 if not.
+        (today .. last_day).each_with_index do |date, i|
+          returned_string += "," if i > 0
+
+          if room_data[i] != nil && room_data[i]['avail'] >= 1 
+          then
+            returned_string += "1"
+          else
+            returned_string += "0"  
+          end
+        end
+
+        wired.release_token
+
+        returned_string + "]"
+      end
+
+      def render_disabled(context)
+        "[]"
+      end
+    end
+  end
+end

data/lib/locomotive/wubook/plugin/check_interval_tag.rb

@@ -0,0 +1,80 @@
+require 'date'
+
+require 'wired'
+require 'locomotive_plugins'
+require_relative 'plugin_helper'
+
+module Locomotive
+  module WuBook
+    class CheckIntervalTag < ::Liquid::Tag
+      include PluginHelper
+      def initialize(tag_name, markup, tokens, context)
+        @options = {
+          room_ident: '',
+          date_start: '',
+          date_end: ''
+        }
+
+        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
+        super
+      end
+
+      def render(context)
+        @plugin_obj = context.registers[:plugin_object]
+        config = @plugin_obj.config
+
+        # Evaluate variables and use the return of the evaluation if it exists..
+        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
+        room_ident_evaluated = context[@options[:room_ident]]
+        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
+        ::Locomotive.log "**> CheckIntervalTag room_ident: #{@options[:room_ident]}"
+
+        raise "Missing parameter 'date_start'" if @options[:date_start].empty?
+        date_start_evaluated = context[@options[:date_start]]
+        @options[:date_start] = date_start_evaluated unless date_start_evaluated.nil?
+        ::Locomotive.log "**> CheckIntervalTag date_start_evaluated: #{@options[:date_start]}"
+
+        raise "Missing parameter 'date_end'" if @options[:date_end].empty?
+        date_end_evaluated = context[@options[:date_end]]
+        @options[:date_end] = date_end_evaluated unless date_end_evaluated.nil?
+        ::Locomotive.log "**> CheckIntervalTag date_end: #{@options[:date_end]}"
+
+        start_day = @options[:date_start]
+        last_day  = @options[:date_end]
+        ::Locomotive.log "**> CheckIntervalTag: Date Interval: #{start_day} - #{last_day}"
+
+        wired = Wired.new(config)
+        wired.aquire_token
+        room_data = request_room_data(wired, config['lcode'], @options[:room_ident], start_day, last_day)
+        wired.release_token
+
+        # Check whether first day is available. If this is _not_ the case we have to add one day (vacation == departure is allowed)
+        is_first_available = room_data[0]['avail'] === 1
+
+        # Check wheter the last day is not available. If this is _not_ the case we have to reduce one day (vacation == departure is allowed)
+        is_last_available = room_data[last_day.mjd - start_day.mjd]['avail'] === 1
+
+        # Remove the first or last day from the array.
+        room_data.shift  unless is_first_available # Remove first element
+        room_data[0..-1] unless is_last_available  # Remove last element
+
+        # Now check the (modified) interval regarding availability
+        is_available = true
+        room_data.each do |data|
+          ::Locomotive.log "**> CheckIntervalTag: check: #{data}"
+          if data['avail'] === 0 then
+            is_available = false;
+            break
+          end
+        end
+
+        is_available ? "Ok" : "Err"
+      end
+
+      def render_disabled(context)
+        "Ok"
+      end
+    end
+  end
+end
+

data/lib/locomotive/wubook/plugin/plugin_helper.rb

@@ -1,13 +1,20 @@
 require 'wired'
 
 module PluginHelper
+        def fetch_room_base_data(wired, lcode, room_id)
+                rooms = wired.fetch_rooms(lcode)
+                filtered_room = rooms.select { |room_hash| room_hash['shortname'] == room_id }
+                ::Locomotive.log "**> Filtered rooms #{filtered_room} "
+
+                filtered_room
+        end
+
         def fetch_room_id(wired, lcode, room_id)
                 # Start with finding the room-id for the room with a special name
-                rooms = wired.fetch_rooms(lcode)
-                filtered_rooms = rooms.select { |room_hash| room_hash['shortname'] == room_id }
-                ::Locomotive.log "**> Filtered rooms #{filtered_rooms} "
-                raise "Unable to find a room with identifier: #{room_id}" if filtered_rooms.length == 0
-                room_identifier = filtered_rooms[0]['id']
+                filtered_room = fetch_room_base_data(wired, lcode, room_id)
+                ::Locomotive.log "**> Filtered rooms #{filtered_room} "
+                raise "Unable to find a room with identifier: #{room_id}" if filtered_room.length == 0
+                room_identifier = filtered_room[0]['id']
                 raise "Unable to get the room id." if room_identifier == nil
 
                 room_identifier

data/lib/locomotive/wubook/plugin/prices_tag.rb

@@ -0,0 +1,65 @@
+require 'date'
+
+require 'wired'
+require 'locomotive_plugins'
+require_relative 'plugin_helper'
+
+module Locomotive
+  module WuBook
+    class PricesTag < ::Liquid::Tag
+      include PluginHelper
+      def initialize(tag_name, markup, tokens, context)
+        @options = {
+          room_ident: ''
+        }
+
+        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
+        super
+      end
+
+      def render(context)
+        @plugin_obj = context.registers[:plugin_object]
+        config = @plugin_obj.config
+
+        returned_string = "["
+
+        # Evaluate variables and use the return of the evaluation if it exists..
+        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
+        room_ident_evaluated = context[@options[:room_ident]]
+        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
+        ::Locomotive.log "**> AvailableDaysTag room_ident: #{@options[:room_ident]}"
+
+        today = Date.today
+        last_day = today.next_month(config['months_ahead'].to_i)
+
+        wired = Wired.new(config)
+        wired.aquire_token
+
+        base_room_data = fetch_room_base_data(wired, config['lcode'], @options[:room_ident])
+        base_price = base_room_data[0]["price"]
+
+        room_data = request_room_data(wired, config['lcode'], @options[:room_ident], today, last_day)
+
+        # Create one entry for each day from now to then.. put a 1 if the day is available or 0 if not.
+        (today .. last_day).each_with_index do |date, i|
+          returned_string += "," if i > 0
+
+          if room_data[i] != nil && room_data[i].has_key?("price")
+          then
+            returned_string += room_data[i]["price"].to_s
+          else
+            returned_string += base_price.to_s  
+          end
+        end
+
+        wired.release_token
+
+        returned_string + "]"
+      end
+
+      def render_disabled(context)
+        "[]"
+      end
+    end
+  end
+end

data/lib/locomotive/wubook/plugin/set_as_booked_tag.rb

@@ -0,0 +1,72 @@
+require 'date'
+
+require 'wired'
+require 'locomotive_plugins'
+require_relative 'plugin_helper'
+
+module Locomotive
+  module WuBook
+    # This tag sets the availability of the given days to 0 (false)
+    class SetAsBookedTag < ::Liquid::Tag
+      include PluginHelper
+      def initialize(tag_name, markup, tokens, context)
+        @options = {
+          room_ident: '',
+          date_start: '',
+          date_end: ''
+        }
+
+        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
+        super
+      end
+
+      def render(context)
+        @plugin_obj = context.registers[:plugin_object]
+        config = @plugin_obj.config
+
+        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
+        room_ident_evaluated = context[@options[:room_ident]]
+        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
+        ::Locomotive.log "**> SetAsBookedTag room_ident: #{@options[:room_ident]}"
+
+        raise "Missing parameter 'date_start'" if @options[:date_start].empty?
+        date_start_evaluated = context[@options[:date_start]]
+        @options[:date_start] = date_start_evaluated unless date_start_evaluated.nil?
+        ::Locomotive.log "**> SetAsBookedTag date_start_evaluated: #{@options[:date_start_evaluated]}"
+
+        raise "Missing parameter 'date_end'" if @options[:date_end].empty?
+        date_end_evaluated = context[@options[:date_end]]
+        @options[:date_end] = date_end_evaluated unless date_end_evaluated.nil?
+        ::Locomotive.log "**> SetAsBookedTag date_end: #{@options[:date_end]}"
+
+        start_day = @options[:date_start]
+        last_day  = @options[:date_end]
+        ::Locomotive.log "**> SetAsBookedTag: Date Interval: #{start_day} - #{last_day}"
+
+        wired = Wired.new(config)
+        wired.aquire_token
+        room_id = fetch_room_id(wired, config['lcode'], @options[:room_ident])
+
+        # Set availability for given date interval to 0
+        days = []
+        (start_day .. last_day).each do |date|
+          # Ignore date.. I will just iterate over every day..
+          days.push({ 'avail' => 0 })
+        end
+        avail_data = [ {'id' => room_id, 'days' => days} ]
+        ::Locomotive.log "**> SetAsBookedTag: Set avail to 0 for: #{start_day}: #{avail_data}"
+        wired.update_rooms_values(config['lcode'], start_day, avail_data)
+
+        wired.release_token
+
+        # Return a html comment that shows us that everything is fine.
+        "<!-- Availability was set to 0 for room #{@options[:room_ident]} from #{@options[:date_start]} to #{@options[:date_end]} -->"
+      end
+
+      def render_disabled(context)
+        "<!-- Locomotive_wubook_plugin is disabled! -->"
+      end
+    end
+  end
+end
+

data/lib/locomotive/wubook/plugin/version.rb

@@ -1,6 +1,6 @@
 
 module Locomotive
   module WuBook
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/lib/locomotive/wubook/plugin.rb

@@ -5,7 +5,11 @@ require 'date'
 
 require 'wired'
 require 'locomotive_plugins'
-require_relative 'plugin/plugin_helper'
+
+require_relative 'plugin/available_days_tag'
+require_relative 'plugin/check_interval_tag'
+require_relative 'plugin/set_as_booked_tag'
+require_relative 'plugin/prices_tag'
 
 module Locomotive
   module WuBook
@@ -26,199 +30,15 @@ module Locomotive
 
       def self.liquid_tags
         { 
-          :available => AvailableDaysBlock,
-          :checkInterval => CheckInterval,
-          :setAsBooked => SetAsBooked
+          :available => AvailableDaysTag,
+          :checkInterval => CheckIntervalTag,
+          :setAsBooked => SetAsBookedTag,
+          :prices => PricesTag
          }
       end
 
       protected
 
     end
-
-    class AvailableDaysBlock < ::Liquid::Tag
-      include PluginHelper
-      def initialize(tag_name, markup, tokens, context)
-        @options = {
-          room_ident: ''
-        }
-
-        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
-        super
-      end
-
-      def render(context)
-        @plugin_obj = context.registers[:plugin_object]
-        config = @plugin_obj.config
-
-        returned_string = "["
-
-        # Evaluate variables and use the return of the evaluation if it exists..
-        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
-        room_ident_evaluated = context[@options[:room_ident]]
-        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
-        ::Locomotive.log "**> AvailableDaysBlock room_ident: #{@options[:room_ident]}"
-
-        today = Date.today
-        last_day = today.next_month(config['months_ahead'].to_i)
-
-        wired = Wired.new(config)
-        wired.aquire_token
-
-        room_data = request_room_data(wired, config['lcode'], @options[:room_ident], today, last_day)
-
-        # Create one entry for each day from now to then.. put a 1 if the day is available or 0 if not.
-        (today .. last_day).each_with_index do |date, i|
-          returned_string += "," if i > 0
-
-          if room_data[i] != nil && room_data[i]['avail'] === 1 
-          then
-            returned_string += "1"
-          else
-            returned_string += "0"  
-          end
-        end
-
-        wired.release_token
-
-        returned_string + "]"
-      end
-
-      def render_disabled(context)
-        "[]"
-      end
-    end
-
-    class CheckInterval < ::Liquid::Tag
-      include PluginHelper
-      def initialize(tag_name, markup, tokens, context)
-        @options = {
-          room_ident: '',
-          date_start: '',
-          date_end: ''
-        }
-
-        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
-        super
-      end
-
-      def render(context)
-        @plugin_obj = context.registers[:plugin_object]
-        config = @plugin_obj.config
-
-        # Evaluate variables and use the return of the evaluation if it exists..
-        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
-        room_ident_evaluated = context[@options[:room_ident]]
-        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
-        ::Locomotive.log "**> CheckInterval room_ident: #{@options[:room_ident]}"
-
-        raise "Missing parameter 'date_start'" if @options[:date_start].empty?
-        date_start_evaluated = context[@options[:date_start]]
-        @options[:date_start] = date_start_evaluated unless date_start_evaluated.nil?
-        ::Locomotive.log "**> CheckInterval date_start_evaluated: #{@options[:date_start]}"
-
-        raise "Missing parameter 'date_end'" if @options[:date_end].empty?
-        date_end_evaluated = context[@options[:date_end]]
-        @options[:date_end] = date_end_evaluated unless date_end_evaluated.nil?
-        ::Locomotive.log "**> CheckInterval date_end: #{@options[:date_end]}"
-
-        start_day = @options[:date_start]
-        last_day  = @options[:date_end]
-        ::Locomotive.log "**> CheckInterval: Date Interval: #{start_day} - #{last_day}"
-
-        wired = Wired.new(config)
-        wired.aquire_token
-        room_data = request_room_data(wired, config['lcode'], @options[:room_ident], start_day, last_day)
-        wired.release_token
-
-        # Check whether first day is available. If this is _not_ the case we have to add one day (vacation == departure is allowed)
-        is_first_available = room_data[0]['avail'] === 1
-
-        # Check wheter the last day is not available. If this is _not_ the case we have to reduce one day (vacation == departure is allowed)
-        is_last_available = room_data[last_day.mjd - start_day.mjd]['avail'] === 1
-
-        # Remove the first or last day from the array.
-        room_data.shift  unless is_first_available # Remove first element
-        room_data[0..-1] unless is_last_available  # Remove last element
-
-        # Now check the (modified) interval regarding availability
-        is_available = true
-        room_data.each do |data|
-          ::Locomotive.log "**> CheckInterval: check: #{data}"
-          if data['avail'] === 0 then
-            is_available = false;
-            break
-          end
-        end
-
-        is_available ? "Ok" : "Err"
-      end
-
-      def render_disabled(context)
-        "Ok"
-      end
-    end
-
-    # This tag sets the availability of the given days to 0 (false)
-    class SetAsBooked < ::Liquid::Tag
-      include PluginHelper
-      def initialize(tag_name, markup, tokens, context)
-        @options = {
-          room_ident: '',
-          date_start: '',
-          date_end: ''
-        }
-
-        markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
-        super
-      end
-
-      def render(context)
-        @plugin_obj = context.registers[:plugin_object]
-        config = @plugin_obj.config
-
-        raise "Missing parameter 'room_ident'" if @options[:room_ident].empty?
-        room_ident_evaluated = context[@options[:room_ident]]
-        @options[:room_ident] = room_ident_evaluated unless room_ident_evaluated.nil? || room_ident_evaluated.empty?
-        ::Locomotive.log "**> SetAsBooked room_ident: #{@options[:room_ident]}"
-
-        raise "Missing parameter 'date_start'" if @options[:date_start].empty?
-        date_start_evaluated = context[@options[:date_start]]
-        @options[:date_start] = date_start_evaluated unless date_start_evaluated.nil?
-        ::Locomotive.log "**> SetAsBooked date_start_evaluated: #{@options[:date_start_evaluated]}"
-
-        raise "Missing parameter 'date_end'" if @options[:date_end].empty?
-        date_end_evaluated = context[@options[:date_end]]
-        @options[:date_end] = date_end_evaluated unless date_end_evaluated.nil?
-        ::Locomotive.log "**> SetAsBooked date_end: #{@options[:date_end]}"
-
-        start_day = @options[:date_start]
-        last_day  = @options[:date_end]
-        ::Locomotive.log "**> SetAsBooked: Date Interval: #{start_day} - #{last_day}"
-
-        wired = Wired.new(config)
-        wired.aquire_token
-        room_id = fetch_room_id(wired, config['lcode'], @options[:room_ident])
-
-        # Set availability for given date interval to 0
-        days = []
-        (start_day .. last_day).each do |date|
-          # Ignore date.. I will just iterate over every day..
-          days.push({ 'avail' => 0 })
-        end
-        avail_data = [ {'id' => room_id, 'days' => days} ]
-        ::Locomotive.log "**> SetAsBooked: Set avail to 0 for: #{start_day}: #{avail_data}"
-        wired.update_rooms_values(config['lcode'], start_day, avail_data)
-
-        wired.release_token
-
-        # Return a html comment that shows us that everything is fine.
-        "<!-- Availability was set to 0 for room #{@options[:room_ident]} from #{@options[:date_start]} to #{@options[:date_end]} -->"
-      end
-
-      def render_disabled(context)
-        "<!-- Locomotive_wubook_plugin is disabled! -->"
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_wubook_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stefan Eilers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locomotive_plugins
@@ -47,8 +47,12 @@ files:
 - Gemfile
 - lib/locomotive/wubook/plugin.rb
 - lib/locomotive/wubook/plugin.rb.orig
+- lib/locomotive/wubook/plugin/available_days_tag.rb
+- lib/locomotive/wubook/plugin/check_interval_tag.rb
 - lib/locomotive/wubook/plugin/config.haml
 - lib/locomotive/wubook/plugin/plugin_helper.rb
+- lib/locomotive/wubook/plugin/prices_tag.rb
+- lib/locomotive/wubook/plugin/set_as_booked_tag.rb
 - lib/locomotive/wubook/plugin/version.rb
 - lib/locomotive_wubook_plugin.rb
 homepage: https://github.com/eilers/locomotive_wubook_plugin