nelson 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe237670123049b19a549ca9fbb13e9e3a8ad7dd
-  data.tar.gz: f306e36af7f6d2c5cebabc1726fa92e53eae712e
+  metadata.gz: 82ec4b93c37ae50aef8150c90dd14f1e959dca31
+  data.tar.gz: 443e8a03fb69dd634d459ce7e97cfcfd8c3e7ce3
 SHA512:
-  metadata.gz: 95d5a5da40ff327ff1ee006b764e0375de747e947bdeddee81b10ccd358e90566478eab1ad71125a00d1b4dab2a31598babf87b3a48d57258aa72b827087185f
-  data.tar.gz: 1b9e0f1ecf82f66514d483dbe89a1d3a89f1ab38db584d39efcdf92cbbbbef8a46a0bf4ed3c6b896f1682da011edeea545f1c9730d172e1323e8c8fb3c4c1962
+  metadata.gz: c05a5f614bf7788d3d71827af5bfc228b958e2ec1852d992022526da4ec5961520a9f33ac9b511da72c0462b9078af7e0d966423fd67318cbaff053159e321c3
+  data.tar.gz: 2060d09305d3dbbed963028e6ea063853a944a90ff4fa44aa8f39d76bd190bfe0cd5454b9377b08e526f1ea938adae231fd20d98760905e9c81cecdbd6196fbf

data/Guardfile

@@ -0,0 +1,50 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  dsl.watch_spec_files_for(dsl.ruby.lib_files)
+
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+
+end

data/lib/nelson/dsl.rb

@@ -0,0 +1,14 @@
+
+module Nelson
+  module DSL
+    module_function
+
+    def product_of(*terms)
+      MultipicationExpressionBuilder.new(*terms)
+    end
+
+    def sum_of(*terms)
+      AdditionExpressionBuilder.new(*terms)
+    end
+  end
+end

data/lib/nelson/expression.rb

@@ -0,0 +1,32 @@
+
+module Nelson
+  class Expression
+    attr_accessor :terms
+
+    def initialize(*terms)
+      raise ArgumentError, "At least 1 term must be specified" unless terms.length > 0
+      @terms = terms
+    end
+
+    def *(term)
+      rhs_value = self.call
+      lhs_value = try_to_eval term
+      MultipicationExpression.new(rhs_value, lhs_value).call
+    end
+
+    def +(term)
+      rhs_value = self.call
+      lhs_value = try_to_eval term
+      AdditionExpression.new(rhs_value, lhs_value).call
+    end
+
+    private
+
+    def try_to_eval(term)
+      term.respond_to?(:call) ? term.call : term
+    end
+  end
+
+  autoload :MultipicationExpression, "nelson/expressions/multipication_expression"
+  autoload :AdditionExpression, "nelson/expressions/addition_expression"
+end

data/lib/nelson/expression_builder.rb

@@ -0,0 +1,27 @@
+
+module Nelson
+  class ExpressionBuilder
+    attr_accessor :terms
+
+    def initialize(*terms)
+      raise ArgumentError, "At least 1 term must be specified" unless terms.length > 0
+      @terms = terms
+    end
+
+    def and(term)
+      terms << term
+      return self
+    end
+
+    def times(term)
+      MultipicationExpressionBuilder.new(self, term)
+    end
+
+    def plus(term)
+      AdditionExpressionBuilder.new(self, term)
+    end
+  end
+
+  autoload :MultipicationExpressionBuilder, "nelson/expression_builders/multipication_expression_builder"
+  autoload :AdditionExpressionBuilder, "nelson/expression_builders/addition_expression_builder"
+end

data/lib/nelson/expression_builders/addition_expression_builder.rb

@@ -0,0 +1,9 @@
+
+module Nelson
+  class AdditionExpressionBuilder < ExpressionBuilder
+    def build
+      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
+      AdditionExpression.new(*terms)
+    end
+  end
+end

data/lib/nelson/expression_builders/multipication_expression_builder.rb

@@ -0,0 +1,19 @@
+
+module Nelson
+  class MultipicationExpression < Expression
+    def call
+      terms.reduce(:*)
+    end
+
+    def to_s
+      terms.sort_by { |t| t.is_a?(Expression) ? 1 : 0 }.reduce("") do |c, t|
+        case t
+        when Expression
+          c << "(#{t})"
+        else
+          c = [c, t].map(&:to_s).reject(&:empty?).join("*")
+        end
+      end
+    end
+  end
+end

data/lib/nelson/expressions/addition_expression.rb

@@ -0,0 +1,15 @@
+
+module Nelson
+  class AdditionExpression < Expression
+    def call
+      terms.reduce(:+)
+    end
+
+
+    def to_s
+      terms.map do |t|
+        t.is_a?(Expression) ? "(#{t})" : t
+      end.join("+")
+    end
+  end
+end

data/lib/nelson/expressions/multipication_expression.rb

@@ -0,0 +1,9 @@
+
+module Nelson
+  class MultipicationExpressionBuilder < ExpressionBuilder
+    def build
+      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
+      MultipicationExpression.new(*terms)
+    end
+  end
+end

data/lib/nelson/version.rb

@@ -1,3 +1,3 @@
 module Nelson
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/nelson.rb

@@ -1,97 +1,8 @@
 require "nelson/version"
+require "nelson/expression"
+require "nelson/expression_builder"
+require "nelson/dsl"
 
 module Nelson
-  def self.product_of(*terms)
-    MultipicationExpressionBuilder.new(*terms)
-  end
-
-  def self.sum_of(*terms)
-    AdditionExpressionBuilder.new(*terms)
-  end
-
-
-  class Expression
-    attr_accessor :terms
-
-    def initialize(*terms)
-      @terms = terms
-    end
-
-    def *(term)
-      rhs_value = self.call
-      lhs_value = term.respond_to?(:call) ? term.call : term
-      MultipicationExpression.new(rhs_value, lhs_value).call
-    end
-
-    def +(term)
-      rhs_value = self.call
-      lhs_value = term.respond_to?(:call) ? term.call : term
-      AdditionExpression.new(rhs_value, lhs_value).call
-    end
-  end
-
-  class ExpressionBuilder
-    attr_accessor :terms
-
-    def initialize(*terms)
-      @terms = terms
-    end
-
-    def and(term)
-      terms << term
-      return self
-    end
-
-    def times(term)
-      MultipicationExpressionBuilder.new(self, term)
-    end
-
-    def plus(term)
-      AdditionExpressionBuilder.new(self, term)
-    end
-  end
-
-  class MultipicationExpression < Expression
-    def call
-      terms.reduce(:*)
-    end
-
-    def to_s
-      terms.sort_by { |t| t.is_a?(Expression) ? 1 : 0 }.reduce("") do |c, t|
-        case t
-        when Expression
-          c << "(#{t})"
-        else
-          c = [c, t].map(&:to_s).reject(&:empty?).join("*")
-        end
-      end
-    end
-  end
-
-  class MultipicationExpressionBuilder < ExpressionBuilder
-    def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      MultipicationExpression.new(*terms)
-    end
-  end
-
-  class AdditionExpression < Expression
-    def call
-      terms.reduce(:+)
-    end
-
-
-    def to_s
-      terms.map do |t|
-        t.is_a?(Expression) ? "(#{t})" : t
-      end.join("+")
-    end
-  end
-
-  class AdditionExpressionBuilder < ExpressionBuilder
-    def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      AdditionExpression.new(*terms)
-    end
-  end
+  extend DSL
 end

data/nelson.gemspec

@@ -18,8 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.1'
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nelson
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Patrick Metcalfe
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library provides a flient API to write math expressions that can
   be manipulated and solved programmatically.
 email:
@@ -78,12 +106,20 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/nelson.rb
+- lib/nelson/dsl.rb
+- lib/nelson/expression.rb
+- lib/nelson/expression_builder.rb
+- lib/nelson/expression_builders/addition_expression_builder.rb
+- lib/nelson/expression_builders/multipication_expression_builder.rb
+- lib/nelson/expressions/addition_expression.rb
+- lib/nelson/expressions/multipication_expression.rb
 - lib/nelson/version.rb
 - nelson.gemspec
 homepage: 
@@ -96,9 +132,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="