ki_middleman 0.0.6 → 0.0.7

data/bin/ki_middleman

@@ -8,7 +8,7 @@ module KiMiddleman
     include Methadone::Main
     include Methadone::CLILogging
 
-    def init
+    def self.init
       config_dir = Kiseru::ConfigDir.new
       assets_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'assets'))
       assets_file = File.join(assets_dir, 'default_transforms.rb')
@@ -23,15 +23,24 @@ module KiMiddleman
     end
 
     main do |arg|
+      help_now! "argument '#{arg}' not supported"  if arg
+
       if options[:init]
         init
+      elsif options[:list]
+        config = KiMiddleman::Config.from_file(Kiseru::ConfigDir.new.file('transforms.rb'))
+        $stdout.puts(config.textual_mapping)
       elsif options[:to]
         begin
           pretty = $stdout.tty?
 
           output_type = options[:to]
           config = KiMiddleman::Config.from_file(Kiseru::ConfigDir.new.file('transforms.rb'))
-          input = MultiJson.load($stdin.read)
+          if options[:file]
+            input = MultiJson.load(File.read(options[:file]))
+          else
+            input = MultiJson.load($stdin.read)
+          end
           output = config.convert_data_to_format(input, output_type)
           $stdout.write MultiJson.dump(output, :pretty => pretty)
         rescue MultiJson::DecodeError => e
@@ -49,6 +58,8 @@ module KiMiddleman
 
     on("--to FORMAT", "The output JSON format")
     on("--init", "Set up the default config files")
+    on("--file FILE", "Read JSON from file")
+    on("--list", "List available transformations")
     go!
 
   end

data/ki_middleman.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = KiMiddleman::VERSION
 
-  gem.add_dependency 'multi_json'
-  gem.add_dependency('methadone')
-  gem.add_dependency('map')
+  gem.add_dependency('multi_json', '~> 1.3.6')
+  gem.add_dependency('methadone', '~> 1.2.1')
+  gem.add_dependency('map', '~> 4.6.1')
 
-  gem.add_development_dependency('debugger')
-  gem.add_development_dependency('rake')
-  gem.add_development_dependency('simplecov')
-  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('debugger', '~> 1.2.0')
+  gem.add_development_dependency('rake', '~> 0.9.2')
+  gem.add_development_dependency('rspec', '~> 2.11.0')
+  gem.add_development_dependency('simplecov', '~> 0.6.4')
 end

data/lib/ki_middleman/config.rb

@@ -9,6 +9,24 @@ module KiMiddleman
       parse(code)
     end
 
+    def textual_mapping
+      output = ""
+      @mapping.each do |key, sub_hash|
+        subkeys = sub_hash.keys.reject  { |x| x.to_s=="outer_block"}
+        subkeys.each_with_index do |sub_key, i|
+          case i
+          when 0
+            output << "#{key} +-> #{sub_key}\n"
+          when subkeys.length - 1
+            output << "#{' '*key.length} \\-> #{sub_key}\n"
+          else
+            output << "#{' '*key.length} |-> #{sub_key}\n"
+          end
+        end
+      end
+      output
+    end
+
     def self.parse(code)
       Config.new(code)
     end
@@ -28,19 +46,42 @@ module KiMiddleman
 
     def convert_data_to_format(data, format)
       self.detect_from_format(data)
-      @format_to_evaluate = format
-      self.set_evaluation_context
+
       raise ConfigError, "No transform from '#{@from_format}' found." unless @mapping.has_key?(@from_format.to_sym)
+
+      best_to_format = find_best_to_format(@from_format, format)
+
+      if !@mapping[@current_from].has_key?(best_to_format)
+        raise ConfigError, "No transform from '#{@current_from}' to '#{format}' found."
+      end
+
+      if best_to_format != format
+        $stderr.puts "WARNING: Using unambiguous match '#{best_to_format}' for '#{format}'"
+      end
+
+      @format_to_evaluate = best_to_format
+      self.set_evaluation_context
       evaluation_context = @mapping[@from_format.to_sym][:outer_block]
       converted_data = evaluation_context.call Map.new(data)
-      converted_data['ki_type'] = format
+      converted_data['ki_type'] = best_to_format
 
       converted_data
     end
 
+    def find_best_to_format(from_format, format)
+      keys = @mapping[from_format].keys.map(&:to_s)
+      matching = keys.select { |key| key.include?(format.to_s) }
+
+      if matching.length == 1
+        match = matching.first
+      else
+        format
+      end
+    end
+
     def initialize(code)
       self.set_parsing_context
-      @mapping = {}
+      @mapping = Map.new({})
       instance_eval code
     end
 

data/lib/ki_middleman/version.rb

@@ -1,3 +1,3 @@
 module KiMiddleman
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki_middleman
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,85 +10,85 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000Z
+date: 2012-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70130545466640 !ruby/object:Gem::Requirement
+  requirement: &70146996153140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70130545466640
+  version_requirements: *70146996153140
 - !ruby/object:Gem::Dependency
   name: methadone
-  requirement: &70130545466220 !ruby/object:Gem::Requirement
+  requirement: &70146996152640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70130545466220
+  version_requirements: *70146996152640
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &70130545465800 !ruby/object:Gem::Requirement
+  requirement: &70146996152180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70130545465800
+  version_requirements: *70146996152180
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70130545465380 !ruby/object:Gem::Requirement
+  requirement: &70146996151720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70130545465380
+  version_requirements: *70146996151720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70130545464960 !ruby/object:Gem::Requirement
+  requirement: &70146996151260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70130545464960
+  version_requirements: *70146996151260
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70130545464540 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70146996150800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70130545464540
+  version_requirements: *70146996150800
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70130545464120 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70146996150340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *70130545464120
+  version_requirements: *70146996150340
 description: Transforms JSON into other JSON
 email:
 - ben@freeagent.com