plant 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08a154178a5f74e79d298b75099d4063418de944
-  data.tar.gz: 75f42385c8d550f8ebc857353cb3f6739325d105
+  metadata.gz: bba9b538452eac1f4dfaefeb3f4c7a8c1c4a991a
+  data.tar.gz: f04525ade799e3f18ffff45adcdd2e7153f34372
 SHA512:
-  metadata.gz: b1d8cc8b2ed63e974c92d04e618b140641a93b7b45421957e89f8346018f8204e3b411959a82671ce5d6b3b8f3d382d579c9905cbfe8c8906707584d19dc68c2
-  data.tar.gz: a9bea19ba2cab72e00cdfbeee0746bacab5bb6a9dedd43405c5f2c166597388611661065bd48d816be564d7ffbe98557af7d79f3a5e8fe4b1fb133d90f18550b
+  metadata.gz: 0bd0763eaf431fe891871e191527f83dea46ebc9478279f01cb866b1a14e4f063ae27ded0d06ff884358e56445017fe0e538f1f3611f8d84d713db1f2ade9e92
+  data.tar.gz: 739f7e7af8fce53bfbc50a9cf8ff670dfb27b87588cb4bb955545bd6879772447ebb03c573cf38adcbe3db3a1cabdf66039cbd735f132f78e0f876631f774a47

data/app/helpers/plant/application_helper.rb

@@ -3,7 +3,7 @@ module Plant
   # Namespace application helper for writing to page
   module ApplicationHelper
     def get_content_for(node, user)
-      Plant::Content.get_node_content(node,user)
+      Plant::Content.get_node_content(node, user)
     end
   end
 end

data/app/models/plant/content.rb

@@ -15,19 +15,16 @@ module Plant
       scenario = scenario.scenario if scenario.respond_to? :scenario
       specific = where(node_id: "#{node}.#{scenario}").first
       return specific.content if specific
-      find_by!(node_id: "#{node}.main").content
+      find_main(node)
     end
 
-    # Can only have one scenario-node_id combination
-    validates_uniqueness_of :scenario, scope: :node_id
-
-    before_validation :add_main
-
-    private
-
-    def add_main
-      append = scenario ? scenario : 'main'
-      self.node_id += ".#{append}" unless node_id.ends_with?(append)
+    def self.find_main(node)
+      main = find_by(node_id: "#{node}.main")
+      return main.content if main
+      find_by!(node_id: "#{node}").content
     end
+
+    # Can only have one scenario-node_id combination
+    validates_uniqueness_of :node_id
   end
 end

data/db/migrate/20150820134825_create_plant_contents.rb

@@ -4,8 +4,6 @@ class CreatePlantContents < ActiveRecord::Migration
     create_table :plant_contents do |t|
       t.string :node_id
       t.text :content
-      t.string :scenario
-
       t.timestamps null: false
     end
   end

data/lib/plant/version.rb

@@ -1,4 +1,4 @@
 # Version file
 module Plant
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plant
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yule