gollum_rails 0.0.2.2 → 0.0.2.4

data/Gemfile.lock

@@ -0,0 +1,151 @@
+PATH
+  remote: .
+  specs:
+    gollum_rails (0.0.2.4)
+      activemodel (~> 3.2.11)
+      builder (~> 3.0.0)
+      gollum (~> 2.4.11)
+      grit (~> 2.5.0)
+      rack (~> 1.4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
+      mail (~> 2.4.4)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    builder (3.0.4)
+    diff-lcs (1.2.0)
+    erubis (2.7.0)
+    github-markdown (0.5.3)
+    github-markup (0.7.5)
+    gollum (2.4.11)
+      github-markdown (~> 0.5.3)
+      github-markup (>= 0.7.4, < 1.0.0)
+      grit (~> 2.5.0)
+      mustache (>= 0.99.4, < 1.0.0)
+      nokogiri (~> 1.5.5)
+      pygments.rb (~> 0.3.2)
+      sanitize (~> 2.0.3)
+      sinatra (~> 1.3.3)
+      stringex (~> 1.5.1)
+      useragent (~> 0.4.15)
+    grit (2.5.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.19)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.5.0)
+    mustache (0.99.4)
+    nokogiri (1.5.6)
+    org-ruby (0.7.2)
+      rubypants (>= 0.2.0)
+    polyglot (0.3.3)
+    posix-spawn (0.3.6)
+    pygments.rb (0.3.7)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
+    rack (1.4.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-protection (1.3.2)
+      rack
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
+      bundler (~> 1.0)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rubypants (0.2.0)
+    sanitize (2.0.3)
+      nokogiri (>= 1.4.4, < 1.6)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.2)
+    shoulda-matchers (1.4.2)
+      activesupport (>= 3.0.0)
+      bourne (~> 1.1.2)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    stringex (1.5.1)
+    thor (0.17.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    useragent (0.4.16)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gollum_rails!
+  org-ruby (~> 0.7.2)
+  rack-test (~> 0.6.2)
+  rails (~> 3.2.11)
+  rake (~> 10.0.2)
+  shoulda (~> 3.3.2)

data/HISTORY.md

@@ -0,0 +1,6 @@
+# 0.0.2 27th January 2013
+
+* Refactored modules prefix
+* Updated Documentation
+* Removed validation
+* Added Rails module support

data/README.md

@@ -34,36 +34,21 @@ Then just run the [Bundler](http://gembundler.com/)
 	
 If you want you can add an initializer into e.g. `config/initializers/gollum_rails.rb`
 
-	Gollum::Rails::Wiki.new(<location>)
+	GollumRails::Wiki.new(<location>)
 
 Now your gollum wiki is ready for use
 
 If you want you can add a model the same way as normal `ActiveRecord` / `ActiveModel`
 
-	class Page < Gollum::Rails::Page
+	class Page < GollumRails::Page
 
 	end
 	
-## Validating
-
-Works like `ActiveRecord` / `ActiveModel` validation
-
-some examples:
-
-	# validates the presence of the Name (already embedded into to gem)
-	validates_presence_of :name
-	
-	# forces the name to have a given format e.g. only 0-9 a-z and A-Z
-	validates_format_of :name, :with => /^[a-zA-Z0-9_]+$/i
-	
-	# checks if the lenght of the content fit
-	validates_length_of :content, :maximum => 500
-	
 ## API
 
 Accessible variables / methods are:
 
-For: `Gollum::Rails::Page`
+For: `GollumRails::Page`
 
 Every action returns a `String`, containing the commit id of the current action
 
@@ -115,7 +100,21 @@ Thats it. Very easy. You can use also `page.save!` method.
 	page.delete!
 	
 	# for getting errors instead of `NIL`
-	
+
+**Set data manually**
+
+	page = Page.new
+
+    page.name = "testpage"
+    page.content = "content"
+    page.format = :markdown
+    page.commit = {
+      				:message => "test action on page",
+      				:name => 'Florian Kasper',
+      				:email => 'nirnanaaa@khnetworks.com'
+    		      }
+    
+		
 ## TODO
 * List all pages
 * Search pages

data/Rakefile

@@ -0,0 +1,164 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+# assumes x.y.z all digit version
+def next_version
+  # x.y.z
+  v = version.split '.'
+  # bump z
+  v[-1] = v[-1].to_i + 1
+  v.join '.'
+end
+
+def bump_version
+  old_file = File.read("lib/#{name}.rb")
+  old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
+  new_version = next_version
+  # replace first match of old vesion with new version
+  old_file.sub!(old_version_line, "  VERSION = '#{new_version}'")
+
+  File.write("lib/#{name}.rb", old_file)
+
+  new_version
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test' << '.'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+desc "Update version number and gemspec"
+task :bump do
+  puts "Updated version to #{bump_version}"
+  # Execute does not invoke dependencies.
+  # Manually invoke gemspec then validate.
+  Rake::Task[:gemspec].execute
+  Rake::Task[:validate].execute
+end
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc 'Create a release build'
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git pull"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc 'Build gem'
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc 'Update gemspec'
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg|test|Home\.md|\.gitattributes)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  #File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc 'Validate lib files and version file'
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end
+

data/gollum_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
    s.name = 'gollum_rails'
-   s.version = '0.0.2.2'
+   s.version = '0.0.2.4'
    
    s.summary = 'Combines the benefits from Gollum with Rails'
    s.description= 'use templating, authentication and so on'
@@ -22,24 +22,27 @@ Gem::Specification.new do |s|
    s.homepage = 'https://github.com/nirnanaaa/gollum_rails'
    s.platform = Gem::Platform::RUBY
    s.required_ruby_version = '>=1.9'
-   s.files = %w[
-     Gemfile
-     HISTORY.md
-     gollum_rails.gemspec
-     LICENSE.md
-     README.md
-     lib/gollum_rails.rb
-     lib/gollum/rails/dependency_injector.rb
-     lib/gollum/rails/page.rb
-     lib/gollum/rails/validations.rb
-     lib/gollum/rails/wiki.rb
-     lib/gollum/rails/version.rb
-     lib/gollum/rails/gollum_rails.rb
-     lib/gollum/rails/engine.rb
-     lib/gollum/rails/config.rb
-     lib/gollum/rails/messages.yml
-     lib/gollum/rails/hash.rb
-   ]
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    Gemfile.lock
+    HISTORY.md
+    LICENSE.md
+    README.md
+    Rakefile
+    gollum_rails.gemspec
+    lib/gollum_rails.rb
+    lib/gollum_rails/config.rb
+    lib/gollum_rails/dependency_injector.rb
+    lib/gollum_rails/engine.rb
+    lib/gollum_rails/gollum_rails.rb
+    lib/gollum_rails/hash.rb
+    lib/gollum_rails/messages.yml
+    lib/gollum_rails/page.rb
+    lib/gollum_rails/validations.rb
+    lib/gollum_rails/wiki.rb
+  ]
+  # = MANIFEST =
    s.require_paths = %w[lib]
    s.has_rdoc = false
    s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }

data/lib/gollum_rails.rb

@@ -1,10 +1,13 @@
 require 'rubygems'
 require 'gollum'
 
+
+
 module Gollum
   module Rails
-    require 'gollum/rails/engine' if defined?(Rails)
+  VERSION = '0.0.2.4'
+    require 'gollum_rails/engine' if defined?(Rails)
   end
 end
 
-require 'gollum/rails/gollum_rails' if defined?(Rails)
+require 'gollum_rails/gollum_rails' if defined?(Rails)

data/lib/{gollum/rails → gollum_rails}/config.rb

@@ -1,7 +1,6 @@
 require 'yaml'
 
-module Gollum
-  module Rails
+module GollumRails
     class Config
       attr_reader :config
       def self.read_config
@@ -34,5 +33,4 @@ module Gollum
       end
 
     end
-  end
 end

data/lib/{gollum/rails → gollum_rails}/dependency_injector.rb

@@ -1,5 +1,4 @@
-module Gollum
-  module Rails
+module GollumRails
     ## simple DI component
     class DependencyInjector
 
@@ -26,5 +25,4 @@ module Gollum
         @storage[name]
       end
     end
-  end
 end

data/lib/{gollum/rails → gollum_rails}/engine.rb

@@ -1,13 +1,11 @@
 require 'rails'
-require 'gollum/rails/config'
+require 'gollum_rails/config'
   
-module Gollum
-  module Rails
+module GollumRails
     class Engine < ::Rails::Engine
       #initialize "gollum_rails.load_app" do |app|
-      ##   Gollum::Rails::Config::rails = app
+      ##   GollumRails::Config::rails = app
      # end
     end
   end
-end
 

data/lib/gollum_rails/gollum_rails.rb

@@ -0,0 +1,6 @@
+require "gollum_rails/engine"
+require 'gollum_rails/config'
+require "gollum_rails/dependency_injector"
+require "gollum_rails/wiki"
+require "gollum_rails/page"
+require 'gollum_rails/validations'

data/lib/{gollum/rails → gollum_rails}/page.rb

@@ -1,7 +1,6 @@
 # ~*~ encoding: utf-8 ~*~
-require "gollum/rails/hash"
-module Gollum
-  module Rails
+require "gollum_rails/hash"
+module GollumRails
     class Page 
       include ActiveModel::Conversion
       include ActiveModel::Validations
@@ -50,7 +49,7 @@ module Gollum
       
       # attributes needs to be a hash
       # example:
-      #   Gollum::Rails::Page.new({name: '', content: '', format: '', commit: {}})
+      #   GollumRails::Page.new({name: '', content: '', format: '', commit: {}})
       #
       #
       # explanation:
@@ -85,7 +84,7 @@ module Gollum
         attributes.each do |name, value|
           send("#{name}=", value)
         end
-
+        
       end
 
       ## checks if @wiki.wiki is an instance of Gollum::Wiki
@@ -126,9 +125,9 @@ module Gollum
       # usage:
       #
       #
-      # wiki = Gollum::Rails::Wiki.new(PATH)
+      # wiki = GollumRails::Wiki.new(PATH)
       #
-      # page = Gollum::Rails::Page.new
+      # page = GollumRails::Page.new
       # cnt = page.find(PAGENAME)
       #
       # commit = {
@@ -207,8 +206,6 @@ module Gollum
         end
       end
 
-
-
       #
       # Validates the Class variables
       # default:
@@ -228,13 +225,14 @@ module Gollum
         if !@format
           @error = @options.messages.format_not_set
           return false
-        end
+        end    
         
         #super #doesn't work atm
         
         return true
       end
 
+      
       #gets an Instance of Gollum::Wiki fetched by find() method
       attr_reader :page
 
@@ -267,7 +265,6 @@ module Gollum
         klass = self.new
         return klass.send(name, args)
       end
-
       #  def method_missing(name, *args)
       #      meth = name.to_s.index("find_by_")
       #      if meth.nil?
@@ -281,5 +278,4 @@ module Gollum
       #  end
 
     end
-  end
-end
+  end

data/lib/gollum_rails/validations.rb

@@ -0,0 +1,10 @@
+## Overrides
+
+module GollumRails
+    class Validations 
+      def self.is_boolean?(variable)
+        variable.is_a?(TrueClass) || variable.is_a?(FalseClass)
+      end
+
+    end
+  end

data/lib/{gollum/rails → gollum_rails}/wiki.rb

@@ -1,5 +1,4 @@
-module Gollum
-  module Rails
+module GollumRails
     class Wiki
       attr_accessor :wiki
       def initialize(path)
@@ -30,5 +29,4 @@ module Gollum
         @wiki
       end
     end
-  end
-end
+  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2.2
+  version: 0.0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -178,21 +178,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - HISTORY.md
-- gollum_rails.gemspec
 - LICENSE.md
 - README.md
+- Rakefile
+- gollum_rails.gemspec
 - lib/gollum_rails.rb
-- lib/gollum/rails/dependency_injector.rb
-- lib/gollum/rails/page.rb
-- lib/gollum/rails/validations.rb
-- lib/gollum/rails/wiki.rb
-- lib/gollum/rails/version.rb
-- lib/gollum/rails/gollum_rails.rb
-- lib/gollum/rails/engine.rb
-- lib/gollum/rails/config.rb
-- lib/gollum/rails/messages.yml
-- lib/gollum/rails/hash.rb
+- lib/gollum_rails/config.rb
+- lib/gollum_rails/dependency_injector.rb
+- lib/gollum_rails/engine.rb
+- lib/gollum_rails/gollum_rails.rb
+- lib/gollum_rails/hash.rb
+- lib/gollum_rails/messages.yml
+- lib/gollum_rails/page.rb
+- lib/gollum_rails/validations.rb
+- lib/gollum_rails/wiki.rb
 homepage: https://github.com/nirnanaaa/gollum_rails
 licenses: []
 post_install_message: 
@@ -211,6 +212,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 770008221
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/gollum/rails/gollum_rails.rb

@@ -1,7 +0,0 @@
-require "gollum/rails/engine"
-require "gollum/rails/version"
-require 'gollum/rails/config'
-require "gollum/rails/dependency_injector"
-require "gollum/rails/wiki"
-require "gollum/rails/page"
-require 'gollum/rails/validations'

data/lib/gollum/rails/validations.rb

@@ -1,10 +0,0 @@
-module Gollum
-  module Rails
-    class Validations
-      include ActiveModel::Validations
-      def self.is_boolean?(variable)
-        variable.is_a?(TrueClass) || variable.is_a?(FalseClass) 
-      end
-    end
-  end
-end

data/lib/gollum/rails/version.rb

@@ -1,5 +0,0 @@
-module Gollum
-  module Rails
-    VERSION = "0.0.1"
-  end
-end