trying to remove all adapter code

lib/gollum_rails.rb

@@ -45,4 +45,3 @@ module GollumRails
 
 end
 
-require 'gollum_rails/adapters/gollum'

lib/gollum_rails/persistance.rb

@@ -11,7 +11,7 @@ module ClassMethods
       #
       # Returns an instance of Gollum::Page or false
       def create(data)
-        page = Page.new(data)
+        page = self.new(data)
         page.save
       end
 
@@ -24,7 +24,7 @@ def create(data)
       #
       # Returns an instance of Gollum::Page
       def create!(data)
-        page = Page.new(data)
+        page = self.new(data)
         page.save!
       end
 
@@ -61,7 +61,7 @@ def save
        rescue ::Gollum::DuplicatePageError => e
          #false
        end
-       @gollum_page = Adapters::Gollum::Page.find_page(name, wiki)
+         @gollum_page = wiki.paged(file_name, path_name, true, wiki.ref)
 
        self
     end
@@ -113,16 +113,33 @@ def update_record
     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)
+        if !args.respond_to?(:stringify_keys)
+          raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
+        end
+        arguments = args.stringify_keys
+        name = arguments["name"] || self.name
+        wiki.update_page(gollum_page,
+                         name,
+                         arguments["format"]||self.format, 
+                         arguments["content"]||self.content,
+                         get_right_commit(args[:commit]))
+        self.gollum_page = wiki.paged(name, path_name, true, wiki.ref)
+        update_attrs
+        self
       end
     end
 
+    def seperate_path(path)
+      path = File.split(name)
+      if path.first == '/' || path.first == '.'
+        folder = nil
+      else
+        folder = path.first
+      end
+    end
+
+
     # == DEPRECATED: Updates an existing page (or created)
     #
     # content - optional. If given the content of the gollum_page will be updated
@@ -134,8 +151,10 @@ def update_attributes(*args)
     #
     # Returns an instance of GollumRails::Page
     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)
-
+      wiki.update_page(gollum_page, name, format||:markdown, content, get_right_commit(commit))
+      self.gollum_page = wiki.paged(file_name, path_name, true, wiki.ref)
+      update_attrs
+      self
     end
 
     # == Deletes current page
@@ -179,4 +198,4 @@ def persisted?
 
 
   end
-end
+end

lib/gollum_rails/store.rb

@@ -44,10 +44,6 @@ def content
       @content ||= (@gollum_page.content || "")
     end
 
-    # Gets the page class
-    def page
-      Adapters::Gollum::Page.new
-    end
 
     private 
     # == To static
@@ -58,4 +54,4 @@ def wiki
 
 
   end
-end
+end

spec/gollum_rails/page_spec.rb

@@ -101,11 +101,22 @@ class RailsModel < GollumRails::Page; end
       end
 
       it "updates properly without all arguments, content+commit" do 
-        @rr.update_attributes({:name => "google", :format => :wiki}).should be_a Gollum::Page 
+        @rr.update_attributes({:name => "google", :format => :wiki}).should be_a GollumRails::Page
+        @rr.delete(@commit)
+      end
+      it "sets the format as created" do
+        @rr.update_attributes(name: "omg", format: :textile)
+        expect(@rr.format).to eq :textile
+        @rr.delete(@commit)
+      end
+
+      it "sets the name as created" do
+        @rr.update_attributes(name: "omg", format: :textile)
+        expect(@rr.name).to eq "omg" 
         @rr.delete(@commit)
       end
       it "updates properly without all arguments, name, format" do
-        @rr.update_attributes({:content => "test"}).should be_a Gollum::Page 
+        @rr.update_attributes({:content => "test"}).should be_a GollumRails::Page 
         expect(@rr.name).to match "Goole"
         expect(@rr.format.to_s).to match "markdown"
         @rr.delete(@commit)
@@ -295,16 +306,6 @@ def after_delete
       test.save
     end
   end
-  describe "rails extension" do
-
-    it "should test fetch_all" do
-      GollumRails::Page.all.length.should == 1
-    end
-    it "should test all" do 
-      GollumRails::Page.find_all.length.should == 1
-    end
-
-  end
   describe "testing validation" do