plain_record 0.4 → 0.4.1

data/.travis.yml

@@ -3,6 +3,8 @@ bundler_args: --without development
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
+  - jruby-19mode
   - rbx-18mode
   - rbx-19mode

data/ChangeLog

@@ -1,3 +1,6 @@
+== 0.4.1 (Diphosgene)
+* Add Psych support to work with Ruby 2.0.
+
 == 0.4 (Phosgene)
 * Allow to store images.
 * Allow to store field in separated file.

data/Gemfile.lock

@@ -6,7 +6,7 @@ GEM
     r18n-core (1.1.3)
     rake (10.0.3)
     redcarpet (2.2.2)
-    rmagick (2.13.1)
+    rmagick (2.13.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -14,8 +14,8 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    yard (0.8.3)
+    rspec-mocks (2.12.2)
+    yard (0.8.4.1)
 
 PLATFORMS
   ruby

data/lib/plain_record.rb

@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 require 'pathname'
 require 'yaml'
 
-YAML::ENGINE.yamler = 'syck' if defined? YAML::ENGINE
-
 dir = Pathname(__FILE__).dirname.expand_path + 'plain_record'
 require dir + 'version'
 require dir + 'callbacks'

data/lib/plain_record/model.rb

@@ -86,7 +86,7 @@ module PlainRecord
     def save_file(file)
       if @loaded.has_key? file
         ::File.open(file, 'w') do |io|
-          io << entries_string(@loaded[file]).slice(5..-1)
+          io << entries_string(@loaded[file]).sub(/^---\s+/, '')
         end
       end
     end

data/lib/plain_record/model/entry.rb

@@ -57,7 +57,8 @@ module PlainRecord
       end
 
       def entries_string(entry)
-        entry.to_yaml + entry.texts.map{ |i| "---\n" + i }.join("\n")
+        entry.data_recursive.to_yaml +
+          entry.texts.map { |i| "---\n" + i }.join("\n")
       end
     end
   end

data/lib/plain_record/model/list.rb

@@ -68,7 +68,7 @@ module PlainRecord
       end
 
       def entries_string(entries)
-        entries.to_yaml
+        entries.map { |i| i.data_recursive }.to_yaml
       end
     end
   end

data/lib/plain_record/resource.rb

@@ -119,9 +119,17 @@ module PlainRecord
       end
     end
 
-    # Return string of YAML representation of entry +data+.
-    def to_yaml(opts = { })
-      @data.to_yaml(opts)
+    # Return model data with plain hash of all child data
+    def data_recursive
+      hash = { }
+      @data.each_pair do |key, value|
+        hash[key] = if value.respond_to? :data_recursive
+          value.data_recursive
+        else
+          value
+        end
+      end
+      hash
     end
 
     # Compare if its fields and texts are equal.

data/lib/plain_record/version.rb

@@ -1,3 +1,3 @@
 module PlainRecord
-  VERSION = '0.4' unless defined? PlainRecord::VERSION
+  VERSION = '0.4.1' unless defined? PlainRecord::VERSION
 end

data/spec/image_spec.rb

@@ -72,6 +72,8 @@ describe PlainRecord::Extra::Image do
     File.should_receive(:exists?).
       with(PlainRecord.root('a/photo.png')).and_return(true)
 
+    FileUtils.stub!(:mkpath)
+    FileUtils.should_receive(:mkpath).with('images/data')
     FileUtils.stub!(:cp)
     FileUtils.should_receive(:cp).
       with(PlainRecord.root('a/photo.png'), 'images/data/photo..png')
@@ -84,6 +86,9 @@ describe PlainRecord::Extra::Image do
     File.should_receive(:exists?).
       with(PlainRecord.root('a/logo.png')).and_return(true)
 
+    FileUtils.stub!(:mkpath)
+    FileUtils.should_receive(:mkpath).with('images/data')
+
     thumb = double('thumb')
     thumb.stub!(:write)
     thumb.should_receive(:write).with('images/data/logo.small.png')

data/spec/resource_spec.rb

@@ -28,14 +28,13 @@ describe PlainRecord::Resource do
     first = Post.first(:title => 'First')
     first.save
 
-    file.rewind
-    file.read.should == "title: First\n" +
-                        "---\n" +
-                        "first --- content\n" +
-                        "---\n" +
-                        "big\n" +
-                        "---\n" +
-                        "content\n"
+    file.string.should == "title: First\n" +
+                          "---\n" +
+                          "first --- content\n" +
+                          "---\n" +
+                          "big\n" +
+                          "---\n" +
+                          "content\n"
   end
 
   it "should save list entry" do

data/spec/spec_helper.rb

@@ -55,10 +55,13 @@ RSpec::Matchers.define :has_methods do |*methods|
   end
 end
 
-RSpec::Matchers.define :has_yaml do |data|
-  match do |file|
-    file.rewind
-    YAML.load(file.read).should == data
+RSpec::Matchers.define :has_yaml do |expected|
+  match do |actual|
+    YAML.load(actual.string).should == expected
+  end
+
+  failure_message_for_should do |actual|
+    "expected #{expected.inspect} to equal #{YAML.load(actual.string)}"
   end
 end
 

metadata

@@ -2,14 +2,14 @@
 name: plain_record
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: '0.4'
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1633277468961939816
+      hash: -3581892843472371509
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false