opulent 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9baf3c32e813f2550fb722422d6c633f6eebe36f
-  data.tar.gz: 2f90f83587e077dde2c39bb064bde69a4b20e744
+  metadata.gz: fb989f9b5f0876f4af2c6951f7ddb013f03f2b83
+  data.tar.gz: 56271859c6703789c2b56157817fca15044256a9
 SHA512:
-  metadata.gz: 96e3437d935c6e9d1d32c092adf5cadc527df97f13a965be7cddbf83da87c8c8048910f34d4cb42030a27969336309660bd1c93885a8bb98f41704185cd0fa68
-  data.tar.gz: 9bee9a6acc7cb0d209cc4c92bf3448d782a649b685bb16d0dc2f1b384c6434b7443794940477445837a474a5b3b9c2601a8b85c2c80566a08ac42f48952bf182
+  metadata.gz: bb801aa49723ef35738eff275ca1b96edc3db5c2080292b13c9e0ff96c9600cb5f5ebe9cb0a63ece21824814b2700be25d348565fbcc63f44e728dc855cac59b
+  data.tar.gz: 82cffc61c9c99d51583b7050ef37bb394358de4ae94927b6b595edea121efb50cb76fbab18e0cbc7430ac423465af137654a59e78db2f86ff6e99d90abd18394

data/bin/opulent

@@ -5,4 +5,4 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'opulent'
 require 'opulent/exec'
 
-Haml::Exec.start ARGV
+Opulent::CLI.new ARGV

data/lib/opulent/exec.rb

@@ -0,0 +1,129 @@
+require 'json'
+require 'yaml'
+require 'opulent/version'
+
+# @Opulent
+module Opulent
+  # @CLI
+  class CLI
+    Extension = /\.(op|opl|opulent)\Z/
+
+    Keywords = %w(context layout locals version help)
+
+    def initialize(arguments)
+      i = 0
+
+      while arguments[i]
+        case arguments[i]
+
+        # opulent input.op output.op
+        when Extension
+          @input = arguments[i]
+          unless arguments[i + 1] =~ /\A\-/ || Keywords.include?(arguments[i+1])
+            @output = arguments[(i += 1)]
+          end
+
+        # opulent -v
+        when '-l', 'layout'
+          if arguments[i + 1] =~ Extension
+            @layout = arguments[(i += 1)]
+          else
+            error "Missing input or incorrect file extension for layout [-l] argument. " +
+            "#{"Found #{arguments[i+1]} instead." if arguments[i+1] }"
+          end
+
+        # opulent -v
+        when '-v', 'version'
+          write "Version #{Opulent::VERSION} is currently installed."
+          return
+
+        # opulent -c
+        when '-c', 'context', '-lc', 'locals'
+          @locals_file = arguments[(i += 1)]
+          error "Given context file #{@locals_file.inspect} does not exist or an incorrect path has been specified." unless File.file? @locals_file
+
+          if File.extname(@locals_file) == '.json'
+            @locals = JSON.parse File.read(@locals_file), symbolize_keys: true
+          elsif File.extname(@locals_file) == '.yml'
+            @locals = YAML.load_file @locals_file
+          else
+            error "Unknown file extension #{@locals_file.inspect} given as locals file. Please use JSON or YAML as input."
+          end
+
+        # opulent -h
+        when '-h', 'help'
+          write help
+          return
+        else
+          error "Unknown input argument [#{arguments[i]}] has been encountered."
+        end
+
+        i += 1
+      end
+
+      if @input
+        @locals ||= {}
+        error "Given input file #{@input.inspect} does not exist or an incorrect path has been specified." unless File.file? @input
+
+        message = ""
+        opulent = Opulent.new
+        if @layout
+          output = Proc.new do
+            opulent.render_file(@layout, @locals) {
+              opulent.render_file(@input, @locals){}
+            }
+          end[]
+        else
+          output = Proc.new do
+            opulent.render_file(@input, @locals)
+          end[]
+        end
+
+        if @output
+          File.open @output, 'w' do |file| file.write output end
+          message += "Successfully rendered #{@input.inspect} to #{@output.inspect}."
+          #message += "Used #{@locals_file.inspect} as local context file." if @locals_file
+        else
+          message += "Successfully rendered #{@input.inspect}.\n\n"
+          #message += "Used #{@locals_file.inspect} as local context file.\n\n" if @locals_file
+          message += "No output file specified. Writing result to terminal.\n\n#{output}"
+        end
+
+        write message
+      else
+        error "You haven't specified an input file."
+      end
+    end
+
+    def help(extra = "")
+      "#{extra}You can use the following commands with the Opulent Command Line Interface: \n\n
+opulent input.op output.op      Render an input file and write the result to the output file.\n
+opulent layout [-l] layout.op   Render an input file using given input layout file.\n
+opulent help [-h]               Show available command line options.\n
+opulent version [-v]            Show installed version.\n"
+    end
+
+    # Give an explicit response for the given input arguments
+    #
+    # @param message [String] Response message to display to the user
+    #
+    def write(message)
+      # Reconstruct lines to display where errors occur
+      puts "\nOpulent " + Logger.green('[Engine]') +
+      "\n---\n" +
+      "#{message}\n\n\n"
+    end
+
+    # Give an explicit error report where an unexpected sequence of tokens
+    # appears and give indications on how to solve it
+    #
+    # @param message [String] Error message to display to the user
+    #
+    def error(message)
+      # Reconstruct lines to display where errors occur
+      fail "\nOpulent " + Logger.red('[Engine]') +
+      "\n---\n" +
+      "#{message}\n\n#{help}\n\n\n"
+    end
+  end
+end

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

data/opulent.gemspec

@@ -35,5 +35,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'htmlentities'
   spec.add_runtime_dependency 'tilt'
-  spec.add_runtime_dependency 'thor'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Grozav
@@ -80,20 +80,6 @@ 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'
 description: Opulent is an intelligent Templating Engine created to speed up web development
   through fast rendering and custom web component definitions.
 email:
@@ -152,7 +138,6 @@ files:
 - docs/syntax.md
 - docs/usage.md
 - lib/opulent.rb
-- lib/opulent/cli.rb
 - lib/opulent/compiler.rb
 - lib/opulent/compiler/block.rb
 - lib/opulent/compiler/comment.rb
@@ -165,6 +150,7 @@ files:
 - lib/opulent/compiler/text.rb
 - lib/opulent/context.rb
 - lib/opulent/engine.rb
+- lib/opulent/exec.rb
 - lib/opulent/filters.rb
 - lib/opulent/logger.rb
 - lib/opulent/parser.rb

data/lib/opulent/cli.rb

@@ -1,12 +0,0 @@
-require 'thor'
-
-# @Opulent
-module Opulent
-  # @CLI
-  class CLI < Thor
-      desc 'hello NAME', 'Display greeting with given NAME'
-      def hello(name)
-        puts "Hello #{name}"
-      end
-    end
-end