dotremap 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2565edd99e70d87d291922f50fac172786cda851
-  data.tar.gz: 14c619762f9d4bb688c9b49339ca7253fd9fd638
+  metadata.gz: 34a3201ef04414e04675f8af66cb93f57a9e25e9
+  data.tar.gz: 166885fbc52cbbcceee17877364759007bca8a08
 SHA512:
-  metadata.gz: 29bd9f928e56fa0f9362f8ec135e819f14bd5619a0cd2bd3c0b15a2d6fff3375ee240e1f497d2d83a13ba481543bac5b54981ca5ecc66230c9ea736f84951e25
-  data.tar.gz: a5385502fce80e93a251e5ea19f64966f0e2018f8d7b5b8bed2aecd74c5e002f7ca8ce730f83417378a6f1620487ba0fe163fa36be78c11e173a11462c6c9b31
+  metadata.gz: d04f733191b79d8e44cfbd7e54c1822a9b53fde2754211500ee7bd31f379f4dc46736a9f3169007995621f193c4183f4b65ec415478a9e43360b3297493c4726
+  data.tar.gz: 984a5717618fdfd4691d2b6a15ea21871c510b2e6d4a156dcb43284bcfe9759545accdb06e206696806ebe3b4a82e97bb285c725d4372db5b66b41c982001f3a

data/dotremap.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Dotremap::VERSION
   spec.authors       = ["Takashi Kokubun"]
   spec.email         = ["takashikkbn@gmail.com"]
-  spec.summary       = %q{Lightweight keyremap configuration DSL}
-  spec.description   = %q{Lightweight keyremap configuration DSL for Karabiner}
-  spec.homepage      = "https://github.com/k0kubun/dotremap"
+  spec.summary       = %q{This gem is moved to karabiner gem. https://github.com/k0kubun/karabiner-dsl}
+  spec.description   = %q{This gem is moved to karabiner gem. https://github.com/k0kubun/karabiner-dsl}
+  spec.homepage      = "https://github.com/k0kubun/karabiner-dsl"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/dotremap/config.rb

@@ -0,0 +1,15 @@
+require "forwardable"
+require "dotremap/namespace"
+
+class Dotremap::Config
+  extend Forwardable
+
+  def_delegator :@parent, :item
+  def_delegator :@parent, :group
+
+  def initialize(name)
+    @name = name
+  end
+
+  attr_writer :parent
+end

data/lib/dotremap/dsl/root.rb

@@ -1,5 +1,6 @@
 require "dotremap/namespace"
 require "dotremap/appdef"
+require "dotremap/config"
 require "dotremap/item"
 require "dotremap/group"
 require "dotremap/dsl/group"
@@ -13,6 +14,13 @@ module Dotremap::DSL::Root
     add_child(group)
   end
 
+  def config(name, &block)
+    config = Dotremap::Config.new(name)
+    config.parent = self
+    config.instance_exec(&block)
+    add_config(config)
+  end
+
   def appdef(appname = '', options = {})
     appdef = Dotremap::Appdef.new(appname, options)
     add_child(appdef)

data/lib/dotremap/property.rb

@@ -1,4 +1,6 @@
 class Dotremap::Property
+  include Dotremap::XmlTree
+
   def initialize(attr, value, options = {})
     @attr = attr.to_s
     @value = value

data/lib/dotremap/root.rb

@@ -6,6 +6,10 @@ class Dotremap::Root
   include Dotremap::XmlTree
   include Dotremap::DSL::Root
 
+  def initialize
+    @configs = []
+  end
+
   def to_xml
     Dotremap::InvokeHistory.registered_applications.each do |application|
       vkopenurldef = Dotremap::Vkopenurldef.new(application)
@@ -17,4 +21,10 @@ class Dotremap::Root
       super(1),
     ].join("\n")
   end
+
+  private
+
+  def add_config(config)
+    @configs << config
+  end
 end

data/lib/dotremap/version.rb

@@ -1,3 +1,3 @@
 class Dotremap
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/dotremap/xml_tree.rb

@@ -1,8 +1,14 @@
 module Dotremap::XmlTree
+  attr_reader :parent
+
   def add_child(*objects)
     objects.each do |object|
       childs << object
     end
+
+    childs.each do |child|
+      child.parent = self
+    end
   end
 
   def search_childs(klass)
@@ -20,9 +26,17 @@ module Dotremap::XmlTree
     ].join("\n")
   end
 
+  protected
+
+  attr_writer :parent
+
   private
 
   def childs
     @childs ||= []
   end
+
+  def parent
+    @parent
+  end
 end

data/spec/lib/dotremap_spec.rb

@@ -246,7 +246,7 @@ describe Dotremap do
     EOS
   end
 
-  it "accepts nested items" do
+  it "accepts group items" do
     prepare_dotremap(<<-EOS)
       group "Option" do
         item "First" do
@@ -276,4 +276,60 @@ describe Dotremap do
       </root>
     EOS
   end
+
+  context "when items are surrounded by config" do
+    it "accepts cmd combination" do
+      prepare_dotremap(<<-EOS)
+        config "Default" do
+          item "Command+A to Command+B" do
+            remap "Cmd-A", to: "Cmd-B"
+          end
+        end
+      EOS
+
+      expect_result(<<-EOS.unindent)
+        <?xml version="1.0"?>
+        <root>
+          <item>
+            <name>Command+A to Command+B</name>
+            <identifier>remap.command_a_to_command_b</identifier>
+            <autogen>__KeyToKey__ KeyCode::A, VK_COMMAND, KeyCode::B, VK_COMMAND</autogen>
+          </item>
+        </root>
+      EOS
+    end
+
+    it "accepts group items" do
+      prepare_dotremap(<<-EOS)
+        config "Original" do
+          group "Option" do
+            item "First" do
+              identifier "option.option_first"
+            end
+
+            item "Second" do
+              identifier "option.option_second"
+            end
+          end
+        end
+      EOS
+
+      expect_result(<<-EOS.unindent)
+        <?xml version="1.0"?>
+        <root>
+          <item>
+            <name>Option</name>
+            <item>
+              <name>First</name>
+              <identifier>option.option_first</identifier>
+            </item>
+            <item>
+              <name>Second</name>
+              <identifier>option.option_second</identifier>
+            </item>
+          </item>
+        </root>
+      EOS
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotremap
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Lightweight keyremap configuration DSL for Karabiner
+description: This gem is moved to karabiner gem. https://github.com/k0kubun/karabiner-dsl
 email:
 - takashikkbn@gmail.com
 executables:
@@ -101,6 +101,7 @@ files:
 - img/enabled.png
 - lib/dotremap.rb
 - lib/dotremap/appdef.rb
+- lib/dotremap/config.rb
 - lib/dotremap/dsl/group.rb
 - lib/dotremap/dsl/item.rb
 - lib/dotremap/dsl/root.rb
@@ -122,7 +123,7 @@ files:
 - spec/lib/dotremap/remap_spec.rb
 - spec/lib/dotremap_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/k0kubun/dotremap
+homepage: https://github.com/k0kubun/karabiner-dsl
 licenses:
 - MIT
 metadata: {}
@@ -145,7 +146,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Lightweight keyremap configuration DSL
+summary: This gem is moved to karabiner gem. https://github.com/k0kubun/karabiner-dsl
 test_files:
 - spec/lib/dotremap/appdef_spec.rb
 - spec/lib/dotremap/karabiner_spec.rb