plant 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b085b89c69b0137fd5b74f50203e21c2612a9ed4
-  data.tar.gz: 1c3ce450bc05c8fdc5ce09e6f4fc85d258915592
+  metadata.gz: d767dab70ab52f596d2604b3e3b1a9ff2ed1d831
+  data.tar.gz: 17aa9c9bded036c02a9431f6196163d150137efc
 SHA512:
-  metadata.gz: 7dae13d4a453ba0527b578fbcef132a7057a50bec1c852e66d060b1372cb6f1d98d5ecd8b4979fe1728fa49af9d4ccc6b65304079c3cc51b084d0ebd57ab143f
-  data.tar.gz: e5435b6e7fc84c40dfbc2bc45f2c594f6b4cb117c638ae45ca3ef099dd7f7bac86da959eca712742e16d98c425fb4ed4c0ff75d3363e8ee06d55f710dc9892b3
+  metadata.gz: 1471762fe46fa15424003009d6845145b87a8a76321a3c21003a0e9dcf12508cb2fec685b4808aaeafb3cfa5682060d4409038b5fe1053639c25594b347491f0
+  data.tar.gz: c3da7fe7ba433d531ccc5b8deeeb402c29343c2a3028295d71ae22480355f92e5ec96b487115c220c6b05f3c4117c47267ac8df04de34422e87663257414836a

data/app/models/plant/content.rb

@@ -1,30 +1,70 @@
 module Plant
   # Model for content
   class Content < ActiveRecord::Base
-    # Gets the content for a given node
+    # Can only have one scenario-node_id combination
+    validates_uniqueness_of :node_id
+
+    # Gets a given node
     #   => Parameter: node ID (string)
-    #   => Parameter: scenario (optional)
-    #      Can either by a string or an object with
-    #      a scenario method, for example a user.
+    #   => Parameter: Options (hash), containing
+    #      - scenario (optional)
+    #        Can either be a string or an object with
+    #        a scenario method, for example a user.
+    #
+    #        If no specific scenario returned, then will
+    #        default back to a nil scenario.
+    #
+    #   => Throws: NotFound if node not found
+    #   => Returns: A content object
+    def self.get_node(node_id, options = {})
+      options = defaults.merge(options)
+      find_specific(node_id, options[:scenario]) || find_main(node_id)
+    end
+
+    def self.defaults
+      { scenario: nil,
+        parameters: {} }
+    end
+
+    # Convenience method to get the content of a given node
+    #  => Paramter: node ID (string)
+    #  => Paramter: Options (hash)
+    #   - scenario
+    #     Can either be a string or an object with
+    #     a scenario method, for example a user
     #
-    #      If no specific scenario returned, then will
-    #      default back to a nil scenario.
-    #      Throws: NotFound if node not found
-    #   => Returns: content for this node
-    def self.get_node_content(node, scenario = nil)
+    #   - Also can be any arbitary key to be injected into the
+    #     returned content. For example
+    #     When called get_node_content(node_id, foo: 'hhh)
+    #     "This is content for #{foo} and bar"
+    #     will return 'This is content for hhh and bar'
+    #
+    #  Note: If second parameter is a string, it will be treated as
+    #  scenario.
+    # Also see: get_node
+    def self.get_node_content(node_id, options = {})
+      options = { scenario: options } unless options.is_a? Hash
+      options = defaults.merge(options)
+      inject_content(get_node(node_id, options).content, options)
+    end
+
+    # Interpolation of content
+    def self.inject_content(content, options)
+      options.each do |key, replacement|
+        content.gsub!("\#\{#{key}\}", replacement.to_s)
+      end
+      content
+    end
+
+    def self.find_specific(node, scenario)
       scenario = scenario.scenario if scenario.respond_to? :scenario
-      specific = where(node_id: "#{node}.#{scenario}").first
-      return specific.content if specific
-      find_main(node)
+      find_by(node_id: "#{node}.#{scenario}")
     end
 
     def self.find_main(node)
       main = find_by(node_id: "#{node}.main")
-      return main.content if main
-      find_by!(node_id: "#{node}").content
+      return main if main
+      find_by!(node_id: "#{node}")
     end
-
-    # Can only have one scenario-node_id combination
-    validates_uniqueness_of :node_id
   end
 end

data/lib/plant/version.rb

@@ -1,4 +1,4 @@
 # Version file
 module Plant
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plant
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yule
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails