gollum_rails 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f71884c345d954f3511cf8c6ea58bb840ae6a50
-  data.tar.gz: fff2ffd81c27dcd66a362a834f6518ec8b0e0261
+  metadata.gz: 6867c0e8089af4224263a975f5186675d5966721
+  data.tar.gz: 78824ef63d8873305c0d4c84ed5048c48a25ea82
 SHA512:
-  metadata.gz: e65f565da5445905b61693867eb482603a85eea98dd0157346631b89ca1c937bb734d057b8ace2af8009076116632f1ab75b9fbdeb66023adfdcd7a9b1946b9a
-  data.tar.gz: cc49fccfab54ae62599b1800eb512966bd2f6074b4c38c58e436ba2e1217fca4083ee5a594f690f1dd5620a42f7c2df92fc7c83d9b22547ecba9a14e2912998a
+  metadata.gz: 2ca79b2d48c22b9e0001b8a81fd7d1c40ca18b6da822d9955a04dc88c49dc643e4a46deada730132e5afbc4f1ff50106666a4e891511593d95527456e0503737
+  data.tar.gz: 916fdd2d83c7e704fe94b4c9ce3921d7c70dd5140343afbbe0a222e638426c9c98c733f429ceed52f7ff55602e964394e2776c9b646f1e67d9bc8372a59069c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.0)
+    gollum_rails (1.5.1)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 1.0.9)

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 1.5.1 28th January 2014
+* Updated `update_attributes` to work with hashes
+* Bugfixing
+
 # 1.5.0 22th January 2014
 * Added parsing support for YAML header `page.meta`
 * Added html rendering without the YAML `page.html_without_yaml`

data/gollum_rails.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.5.0'
+  s.version = '1.5.1'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'

data/lib/gollum_rails.rb

@@ -45,7 +45,7 @@ module GollumRails
   autoload :Meta
 
   # GollumRails version string
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 
 end
 

data/lib/gollum_rails/finders.rb

@@ -49,11 +49,11 @@ module GollumRails
         end
       end
       
-      def first(options)
+      def first(options={})
         all(options).first
       end
       
-      def last(options)
+      def last(options={})
         all(options).last
       end
       

data/lib/gollum_rails/persistance.rb

@@ -107,6 +107,24 @@ module GollumRails
     
     # == Updates an existing page (or created)
     #
+    # args - Argument chain
+    #
+    # Returns an instance of GollumRails::Page
+    def update_attributes(*args)
+      run_callbacks :update do
+        return update_deprecated(*args) if args.length > 1
+        #content=nil,name=nil,format=:markdown, commit=nil
+        args = args.first
+        @gollum_page = page.update_page(gollum_page, wiki, 
+          args[:content], 
+          get_right_commit(args[:commit]), 
+          args[:name], 
+          args[:format]||:markdown)
+      end
+    end
+    
+    # == DEPRECATED: Updates an existing page (or created)
+    #
     # content - optional. If given the content of the gollum_page will be updated
     # name - optional. If given the name of gollum_page will be updated
     # format - optional. Updates the format. Uses markdown as default
@@ -115,10 +133,9 @@ module GollumRails
     #
     #
     # Returns an instance of GollumRails::Page
-    def update_attributes(content=nil,name=nil,format=:markdown, commit=nil)
-      run_callbacks :update do
-        @gollum_page = page.update_page(gollum_page, wiki, content, get_right_commit(commit), name, format)
-      end
+    def update_deprecated(content=nil,name=nil,format=:markdown, commit=nil)
+      @gollum_page = page.update_page(gollum_page, wiki, content, get_right_commit(commit), name, format)
+      
     end
     
     # == Deletes current page

data/spec/gollum_rails/page_spec.rb

@@ -82,19 +82,20 @@ describe "Gollum Page" do
         @rr.save
       end
       
-      it { @rr.update_attributes({:name => "google", :format => :wiki}).should be_a Gollum::Page }
-      
-    end
-    describe "method missings" do
-      
-      it "should perform a normal find" do
-        RailsModel.find_by_name('Goole').should be_a GollumRails::Page
-          
-        
+      it "updates properly without all arguments, content+commit" do 
+        @rr.update_attributes({:name => "google", :format => :wiki}).should be_a Gollum::Page 
+        @rr.delete(@commit)
+      end
+      it "updates properly without all arguments, name, format" do
+        @rr.update_attributes({:content => "test"}).should be_a Gollum::Page 
+        expect(@rr.name).to match "Goole"
+        expect(@rr.format.to_s).to match "markdown"
+        @rr.delete(@commit)
       end
       
     end
 
+
     describe "should test the deletion of a page" do
       before :each do 
         @rr = RailsModel.new @call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel