hasmenu 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4f1d3dd3fe8a08c94ee2b3d2045d54908786ec
-  data.tar.gz: 8c772941d955ead4c437f182f4393f6e28cf6230
+  metadata.gz: f4c67d0fda35a2b5479df296c04e0e183f47e6bf
+  data.tar.gz: 90b6934689ac3cdde699ca838c594c7e7d33bc67
 SHA512:
-  metadata.gz: f2c5b2526513ebb22363b73cbe17a56b3907e31386a95ba6838f38c840aac12f98fa102aec7cc2a9106e353842460e780d6501d53b084a44a39927a0935d7903
-  data.tar.gz: 7b2a8e855e3310bc7aeab0ffa8c570525ae8cff4b882da9c634a8c0a345fb5a9bdffa2ec03b94ce08d5b796321cfd9658808f42fe7e3bd67f84dc043369ab71c
+  metadata.gz: cdd4ac6dfe539f6a62cf97391c71c4abd19c83782203bd671eaf13efdb085588af34bb04bb266ec683d787e152fe07b87b300b77accace3ceccf50c1289eb256
+  data.tar.gz: 8e60ef41d057082196c9a190f35cfc5262da56d1de6cf9907a539b103576a330d8b910d641cf413f554a588ffb30bae88b3364705ef9e970c645181de64942bf

data/README.md

@@ -8,6 +8,12 @@ A utility to collect and process data for Has.Menu
 
 ## Usage
 
+### Format Files
+
+  hasmenu format chains <chains-file>
+  hasmenu format restaurants <restaurants-file>
+  hasmenu format menu <chain-or-restaurant-menu>
+
 ### Spellcheck Menu
 
 You can spellcheck an individual file

data/hasmenu.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
+  spec.add_dependency "activesupport"
   spec.add_dependency "colorize"
   spec.add_dependency "json_schema"
+  spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/hasmenu/builder.rb

@@ -14,15 +14,15 @@ module Hasmenu
 
       output["restaurant"] = restaurant
 
-      chain   = restaurant["chain"]
-      menus   = menu_uid ? "#{menu_uid}.yml" : "*.yml"
-      pattern = File.join("#{@location}/menu/chain/#{chain}/#{menus}")
+      chain = restaurant["chain"]
+      menus = menu_uid ? "#{menu_uid}.yml" : "*.yml"
+      pattern = File.join(@location, "data", "menu", "chain", chain, menus)
 
       Dir.glob(pattern).each do |menu|
         chain_menu = YAML.load_file(menu)
         output["restaurant"]["menus"] = chain_menu["chain"]["menus"]
 
-        restaurant_dir = File.join(@location, "menu", "restaurant", restaurant["uid"])
+        restaurant_dir = File.join(@location, "data", "menu", "restaurant", restaurant["uid"])
         FileUtils.mkdir_p(restaurant_dir) unless File.directory?(restaurant_dir)
 
         menu_file = File.join(restaurant_dir, File.basename(menu))
@@ -32,7 +32,7 @@ module Hasmenu
     end
 
     def build(uid, menu_uid)
-      restaurants_yml = "#{@location}/restaurants.yml"
+      restaurants_yml = File.join(@location, "data", "restaurants.yml")
       unless File.exist? restaurants_yml
         print_invalid_path
         return
@@ -48,6 +48,7 @@ module Hasmenu
           restaurants
         else
           print_invalid_build
+          return
       end
 
       print_build_start

data/lib/hasmenu/formatter.rb

@@ -5,7 +5,7 @@ module Hasmenu
     include Printer
 
     def initialize(type, options)
-      @type = type
+      @type = type.chomp("/")
       @location = options[:location] || Dir.pwd
     end
 
@@ -32,7 +32,7 @@ module Hasmenu
     end
 
     def format_files(path)
-      Dir.glob(path + "/**/*.yml") do |file|
+      Dir.glob(File.join(path, "**", "*.yml")) do |file|
         format_file file
       end
     end

data/lib/hasmenu/reporter.rb

@@ -19,11 +19,16 @@ module Hasmenu
     end
 
     def load_data
-      @yaml_chains       = get_data "chains.yml", "uid"
-      @yaml_restaurants  = get_data "restaurants.yml", "uid"
-      @restaurant_chains = get_data "restaurants.yml", "chain"
-      @file_chains       = get_folder Dir.glob("#{@location}/menu/chain/**/*.yml")
-      @file_restaurants  = get_folder Dir.glob("#{@location}/menu/restaurant/**/*.yml")
+      chains = File.join(@location, "data", "chains.yml")
+      restaurants = File.join(@location, "data", "restaurants.yml")
+      chain_menus = File.join(@location, "data", "menu", "chain", "**", "*.yml")
+      restaurant_menus = File.join(@location, "data", "menu", "restaurant", "**", "*.yml")
+
+      @yaml_chains       = get_data chains, "uid"
+      @yaml_restaurants  = get_data restaurants, "uid"
+      @restaurant_chains = get_data restaurants, "chain"
+      @file_chains       = get_folder Dir.glob(chain_menus)
+      @file_restaurants  = get_folder Dir.glob(restaurant_menus)
     end
 
     def report_chains

data/lib/hasmenu/spellchecker.rb

@@ -15,7 +15,7 @@ module Hasmenu
     include Printer
 
     def initialize(options)
-      @dictd = options[:dicts] || File.join(Dir.pwd, ".meta", "dicts")
+      @dictd = options[:dicts] || File.join(Dir.pwd, "dict")
       @xcept = options[:except]
       @dicts = []
     end
@@ -56,7 +56,7 @@ module Hasmenu
     end
 
     def spell_check_all(path)
-      Dir.glob(path + "/**/*.yml") do |file|
+      Dir.glob(File.join(path, "**", "*.yml")) do |file|
         spell_check file
       end
     end

data/lib/hasmenu/validator.rb

@@ -14,7 +14,7 @@ module Hasmenu
     end
 
     def load_schema
-      file = File.join(@schemad, "#{@type}-v4.json")
+      file = File.join(@schemad, "#{@type}.json")
 
       if File.file? file
         schema_data = JSON.parse File.read(file)
@@ -96,7 +96,7 @@ module Hasmenu
     end
 
     def validate_all(path)
-      Dir.glob(path + "/**/*.yml") do |file|
+      Dir.glob(File.join(path, "**", "*.yml")) do |file|
         validate file
       end
     end

data/lib/hasmenu/version.rb

@@ -1,3 +1,3 @@
 module Hasmenu
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: hasmenu
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Geordee Naliyath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement