home_assistant-generator 0.1.0.pre.alpha.pre.8 → 0.1.0.pre.alpha.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf97a0d12c7f105117561c6e0b502cbad6dd1a3f
-  data.tar.gz: 4b444399b1ec740d7098ccff7fe12855f86bafd2
+  metadata.gz: 56be305faa1ef040a0690afb8911bee8719066f9
+  data.tar.gz: b111391114c8bb8143f68a2edf41fc4181d366c3
 SHA512:
-  metadata.gz: 277d45c284966d5fb14949dda657bb4764df3a99a70fb50fa495618c4896f68caf7cd1cb3323a5a5be63d4e38fc57eeda6dab124611f70e4f709cb564c9731a5
-  data.tar.gz: 065109efbe395e7119372a03951838abdf5e86fbfefd092e2ec53563f56f6c5e992c19966c0384823eaff694cf45bc3eaa9679d8d19977ded1a52b4b005bc8a9
+  metadata.gz: 44d2df897c33d0ddbbba4c61f7434abb7c6d4f4eb8eb473e694a46b0ee3e016405f2abc5cd140bf15891d090c859b7f83ea489b2723f9037fa20aac7b14f6c2b
+  data.tar.gz: da98eca2a2f46f0631df65e981e357da2c60bf044762f6c89c558e1361c733fb05cdf6e4718e65fe21c5eb56345f4f34c78d6c88a234c1dea61c8d9933615ab2

data/example_config.rb

@@ -6,10 +6,10 @@ end
 
 
 automation 'Activate movie playing scene' do
-  trigger.when('KoKodi').from(:paused).to(:playing)
+  #trigger.when('KoKodi').from(:paused).to(:playing)
 
   # Other examples
-  # trigger.when('KoKodi').playing
+   trigger.when('KoKodi').playing
   # equivalent to:
   # trigger.when('KoKodi').to(:playing)
 

data/lib/home_assistant/generator/automation.rb

@@ -1,45 +1,53 @@
+require_relative 'properties'
+
 module HomeAssistant
   module Generator
     # describe an automation from home-assistant
     class Automation
-      attr_reader :properties
+      prepend Properties
 
       def initialize(name, &block)
-        @properties = {}
-        properties[:alias] = name
+        properties['alias'] = name
         instance_eval(&block)
       end
 
       def trigger
-        properties[:trigger] ||= Trigger.new
-        properties[:trigger]
+        properties['trigger'] ||= Trigger.new
+        properties['trigger']
       end
 
       class Trigger
-        attr_reader :properties
+        prepend Properties
+        attr_reader :sub
         def initialize
-          @properties = {}
+          @sub = nil
         end
 
         def when(component_short_name)
           # TODO: search for real entity_id
-          properties[:entity_id] = component_short_name
-          properties[:platform] = 'state'
-          self
+          properties['entity_id'] = component_short_name
+          properties['platform'] = 'state'
+          @sub = State.new(properties)
+          @sub
         end
 
-        def method_missing(name, *args)
-          case args.size
-          when 1 
-            properties[name] = args.first
-          when 0
-            properties[:to] = name
-          else
-            super
+        class State
+          def initialize(properties)
+            @properties = properties
           end
-          self
-        end
 
+          def method_missing(name, *args)
+            case args.size
+            when 1
+              @properties[name.to_s] = args.first
+            when 0
+              @properties['to'] = name
+            else
+              super
+            end
+            self
+          end
+        end
       end
     end
   end

data/lib/home_assistant/generator/component.rb

@@ -1,13 +1,13 @@
-require 'mash'
+require_relative 'properties'
 
 module HomeAssistant
   module Generator
     # generic home-assistant component
     class Component
-      attr_reader :properties
+      prepend Properties
+
       attr_accessor :component_class
       def initialize(name)
-        @properties = Mash.new
         send(name_property, name)
       end
 
@@ -15,14 +15,10 @@ module HomeAssistant
         :name
       end
 
-      def to_h
-        properties.to_hash
-      end
-
       def method_missing(name, *args)
         super unless args.one?
 
-        properties[name.to_sym] = case args.first
+        properties[name.to_s] = case args.first
                                   when Symbol
                                     args.first.to_s
                                   else

data/lib/home_assistant/generator/dsl.rb

@@ -1,4 +1,3 @@
-require 'mash'
 require 'yaml'
 
 require_relative 'component'
@@ -15,8 +14,9 @@ module HomeAssistant
         @automations = []
       end
 
-      def eval(file_path)
-        instance_eval(File.read(file_path), file_path)
+      def eval(file_path = nil, &block)
+        instance_eval(File.read(file_path), file_path) if file_path
+        instance_eval(&block) if block_given?
       end
 
       def method_missing(name, *args, &block)
@@ -36,17 +36,18 @@ module HomeAssistant
       end
 
       def automation(name, &block)
-        Automation.new(name, &block).tap { automations << automation }
+        Automation.new(name, &block).tap { |auto| automations << auto }
       end
 
       def to_s
-        config = component_list.inject(Mash.new) do |mem, component|
-          mem[component.component_class] ||= []
-          mem[component.component_class] << component.to_h
+        config = component_list.inject({}) do |mem, component|
+          mem[component.component_class.to_s] ||= []
+          mem[component.component_class.to_s] << component.to_h
           mem
         end
 
-        config.to_hash.to_yaml
+        config = config.merge('automation' => automations.map(&:to_h))
+        config.to_h.to_yaml
       end
 
       private

data/lib/home_assistant/generator/properties.rb

@@ -0,0 +1,43 @@
+class Hash
+  # reimplem of ruby 2.4 transform_values
+  if RUBY_VERSION < '2.4'
+    def transform_values
+      Hash[
+        self.map do |k, v|
+          [k, (yield v)]
+        end
+      ]
+    end
+  end
+end
+module HomeAssistant
+  module Generator
+    # can be prepended by any class with properties hash
+    module Properties
+      attr_reader :properties
+
+      def initialize(*args)
+        @properties = {}
+        super
+      end
+
+      def to_h
+        has_to_h = ->(x) { x.respond_to?(:to_h) }
+        properties.transform_values do |value|
+          case value
+          when String, Integer, TrueClass, FalseClass
+            value
+          when Symbol
+            value.to_s
+          when has_to_h
+            value.to_h
+          when Array
+            raise NotImplementedError, 'should be implemented for arrays as well!'
+          else
+            raise "Can't convert #{value} to a hash"
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: home_assistant-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.pre.8
+  version: 0.1.0.pre.alpha.pre.10
 platform: ruby
 authors:
 - Grégoire Seux
@@ -88,6 +88,7 @@ files:
 - lib/home_assistant/generator/automation.rb
 - lib/home_assistant/generator/component.rb
 - lib/home_assistant/generator/dsl.rb
+- lib/home_assistant/generator/properties.rb
 - lib/home_assistant/generator/version.rb
 homepage: 
 licenses: