gollum_rails 0.0.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e41af3125cdcc43422294feedf11dc6eef18661
-  data.tar.gz: f16d153ea9d97b819da9df159eff4670f0ab2ed8
+  metadata.gz: 09f7ee2859734417d3752763d1c3c1b3c162a8df
+  data.tar.gz: b69cae667fa9c8ec7c81215133ca1062e741e76a
 SHA512:
-  metadata.gz: ae6e9c0ffdf2ca8807824065597dd936ad870781046385a7698bde4bd51b0fec5b358965e7e5c33a32e4b465447d09ff1b09eda9adad2c14f791fd111bc8a6bb
-  data.tar.gz: 5b2887aa33886262d52fceade5291de7d63bb3f797dea6f189688d947a8516204ae0b76af6d5e85f555287c8f5523cdc7d0f7a3d907830ccaff1d2e6e31c9e25
+  metadata.gz: 3be4a36dd812402751dad7cdbdf2fe63fe4be10c11f3963ab8c20d470651184a2283c181439141cc101cf4428f89d4696dce2e452e1edb4e85a91b160fda3a78
+  data.tar.gz: 68a520d6a40e235ed6fff4a37cd9a4b3bc78282c61bbc1b137b5d5b05538f05a40fde1af8460e63e1d378879515190121e9d575c25c8f9927f2490b9205dc932

data/Gemfile.lock

@@ -10,11 +10,9 @@ GIT
 PATH
   remote: .
   specs:
-    gollum_rails (0.0.8)
+    gollum_rails (1.0.0)
       activemodel (~> 3.2.13)
-      builder (~> 3.0.0)
-      gollum-lib (~> 0.0.1)
-      rack (~> 1.4.5)
+      gollum-lib (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -49,7 +47,7 @@ GEM
     arel (3.0.2)
     builder (3.0.4)
     colorize (0.5.8)
-    coveralls (0.6.3)
+    coveralls (0.6.4)
       colorize
       multi_json (~> 1.3)
       rest-client
@@ -59,11 +57,11 @@ GEM
     erubis (2.7.0)
     github-markdown (0.5.3)
     github-markup (0.7.5)
-    gollum-lib (0.0.1)
+    gollum-lib (1.0.0)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
       grit (~> 2.5.0)
-      nokogiri (~> 1.5.6)
+      nokogiri (~> 1.5.9)
       pygments.rb (~> 0.4.2)
       sanitize (~> 2.0.3)
       stringex (~> 1.5.1)

data/HISTORY.md

@@ -1,5 +1,19 @@
-# 0.0.6 4th April 2013
-* Validators
+# 1.0.0 3th April 2013
+* added validators
+* removed unused gems
+* updated documentation
+* removed unused middleware
+* improved code coverage
+
+# 0.0.8 1th April 2013
+* updated documentation
+* removed unused code
+
+# 0.0.7 1th April 2013
+* improved installation instructions
+* improved performance
+
+# 0.0.6 1th April 2013
 * missing generators added
 
 # 0.0.5 31th March 2013

data/gollum_rails.gemspec

@@ -4,17 +4,17 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '0.0.8'
+  s.version = '1.0.0'
 
   s.summary = 'Combines the benefits from Gollum and Rails'
   s.description= 'Use all the benefits from Rails and combine them with the awesome Gollum wiki'
   #File.read(File.join(File.dirname(__FILE__), 'README.md'))
 
   s.add_dependency 'activemodel', '~> 3.2.13'
-  s.add_dependency 'gollum-lib', '~> 0.0.1'
+  s.add_dependency 'gollum-lib', '~> 1.0.0'
   #s.add_dependency 'grit', '~> 2.5.0'
-  s.add_dependency 'builder', '~> 3.0.0'
-  s.add_dependency 'rack', '~> 1.4.5'
+  #s.add_dependency 'builder', '~> 3.0.0'
+  #s.add_dependency 'rack', '~> 1.4.5'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rails', '~> 3.2.13'
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
     LICENSE
     README.md
     Rakefile
-    examples/rails/initializer.rb
     gollum_rails.gemspec
     lib/generators/gollum_rails/install/install_generator.rb
     lib/generators/gollum_rails/install/templates/gollum_initializer.rb
@@ -48,7 +47,6 @@ Gem::Specification.new do |s|
     lib/gollum_rails/adapters/activemodel/boolean.rb
     lib/gollum_rails/adapters/activemodel/error.rb
     lib/gollum_rails/adapters/activemodel/naming.rb
-    lib/gollum_rails/adapters/activemodel/validation.rb
     lib/gollum_rails/adapters/gollum.rb
     lib/gollum_rails/adapters/gollum/.gitkeep
     lib/gollum_rails/adapters/gollum/committer.rb
@@ -65,12 +63,16 @@ Gem::Specification.new do |s|
 
 
   s.require_paths = %w[lib]
-  s.post_install_message = "Important: \n\n" \
-  "**********************************************\n\n" \
-  "To use the 'autoinitializer' just run the following command:\n\n"\
-  "\trails g gollum_rails:install\n\n"\
-  "To generate a new Page model just run:\n\n"\
-  "\trails g gollum_rails:model MODEL_NAME\n"\
-  "**********************************************"
+  s.post_install_message = <<-END 
+  Important: \n
+  **********************************************
+  To use the installer just run the following command:
+  \trails g gollum_rails:install\n
+  To generate a new Page model just run:
+  \trails g gollum_rails:model MODEL_NAME\n
+  To install an additional parsing language run:
+  rails g gollum_rails:language LANGUAGE
+  **********************************************"
+  END
 end
 

data/lib/gollum_rails.rb

@@ -12,7 +12,7 @@ require 'gollum-lib'
 module GollumRails
   
   # GollumRails version string
-  VERSION = '0.0.8'
+  VERSION = '1.0.0'
   
   # Simplified error
   class Error < StandardError; end

data/lib/gollum_rails/adapters/activemodel.rb

@@ -34,7 +34,7 @@ module GollumRails
     module ActiveModel
 
       # connector version
-      VERSION="1.9.0"
+      VERSION="1.10.0"
     end
   end
 end
@@ -42,4 +42,6 @@ end
 require File.expand_path '../activemodel/boolean', __FILE__
 require File.expand_path '../activemodel/naming', __FILE__
 require File.expand_path '../activemodel/error', __FILE__
-require File.expand_path '../activemodel/validation', __FILE__
+
+# removed in 0.0.8
+#require File.expand_path '../activemodel/validation', __FILE__

data/lib/gollum_rails/page.rb

@@ -14,6 +14,7 @@ module GollumRails
   #
   class Page 
     extend ::ActiveModel::Callbacks
+    include ::ActiveModel::Validations
     include ::ActiveModel::Conversion
     extend ::ActiveModel::Naming
     
@@ -44,8 +45,7 @@ module GollumRails
     # commit must be given to perform any page action!
     def initialize(attrs = {})
       if Adapters::Gollum::Connector.enabled
-        attrs.each{|k,v| self.instance_variable_set("@#{k}", v)}
-        attrs.each{|k,v| self.class.validator.instance_variable_set("@#{k}", v)}
+        attrs.each{|k,v| self.public_send("#{k}=",v)} if attrs
       else
         raise GollumInternalError, 'gollum_rails is not enabled!'
       end
@@ -58,11 +58,11 @@ module GollumRails
     # Sets the wiki instance
     attr_writer :wiki
 
-    # Sets the pages name
-    attr_writer :name
+    # Gets / Sets the pages name
+    attr_accessor :name
 
-    # Sets the contents content
-    attr_writer :content
+    # Gets / Sets the contents content
+    attr_accessor :content
 
     # Sets the commit Hash
     attr_writer :commit
@@ -82,16 +82,6 @@ module GollumRails
       @wiki || Adapters::Gollum::Connector.wiki_class
     end
 
-    # Gets the pages' name
-    def name
-      @name || @gollum_page.name
-    end
-
-    # Gets the raw content of the current page
-    def content
-      @content || @gollum_page.raw_content
-    end
-
     # Need to implement the Committer connector (forgot it completely)
     # Gets the commit Hash from current object
     def commit
@@ -100,7 +90,7 @@ module GollumRails
 
     # Gets the pages format
     def format
-      (@format || @gollum_page.format).to_sym
+      @format.to_sym
     end
 
     # Gets the validator
@@ -212,6 +202,11 @@ module GollumRails
       end
     end
 
+    # checks if entry already has been saved
+    # 
+    #
+    def persisted?
+    end
     # Previews the page - Mostly used if you want to see what you do before saving
     # 
     # This is an extremely performant method!
@@ -238,27 +233,6 @@ module GollumRails
       page.find_page name
     end
 
-    # todo
-    def valid?
-      self.class.validate self,true
-    end
-    
-    # Validation functions
-    #
-    # context - The current config
-    # check - check now
-    # block - Validations
-    #
-    # Returns true or raises an exception
-    def self.validate(context=nil,check=false,&block)
-      #if block
-      #  @@gollum_page = block
-      #end
-      #if check
-      #  @@gollum_page.call context.class.validator 
-      #end
-    end
-
     # Finds an existing page or creates it
     #
     # name - The name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,42 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +107,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- examples/rails/initializer.rb
 - gollum_rails.gemspec
 - lib/generators/gollum_rails/install/install_generator.rb
 - lib/generators/gollum_rails/install/templates/gollum_initializer.rb
@@ -147,7 +118,6 @@ files:
 - lib/gollum_rails/adapters/activemodel/boolean.rb
 - lib/gollum_rails/adapters/activemodel/error.rb
 - lib/gollum_rails/adapters/activemodel/naming.rb
-- lib/gollum_rails/adapters/activemodel/validation.rb
 - lib/gollum_rails/adapters/gollum.rb
 - lib/gollum_rails/adapters/gollum/.gitkeep
 - lib/gollum_rails/adapters/gollum/committer.rb
@@ -163,9 +133,11 @@ homepage: http://gollum.zyg.li
 licenses:
 - AGPL
 metadata: {}
-post_install_message: "Important: \n\n**********************************************\n\nTo
-  use the 'autoinitializer' just run the following command:\n\n\trails g gollum_rails:install\n\nTo
-  generate a new Page model just run:\n\n\trails g gollum_rails:model MODEL_NAME\n**********************************************"
+post_install_message: "  Important: \n\n  **********************************************\n
+  \ To use the installer just run the following command:\n  \trails g gollum_rails:install\n\n
+  \ To generate a new Page model just run:\n  \trails g gollum_rails:model MODEL_NAME\n\n
+  \ To install an additional parsing language run:\n  rails g gollum_rails:language
+  LANGUAGE\n  **********************************************\"\n"
 rdoc_options: []
 require_paths:
 - lib

data/lib/gollum_rails/adapters/activemodel/validation.rb

@@ -1,188 +0,0 @@
-module GollumRails
-  module Adapters
-    module ActiveModel
-
-      # General Validation Class including validations
-      class Validation
-        include ::ActiveModel::Validations
-        
-        #########
-        protected
-        #########
-
-        # Sets the variable, used to validate
-        attr_writer :variable
-        
-        # Sets the Filter
-        attr_accessor :filter
-
-        # Sets all instance errors to this variable
-        attr_writer :error
-
-        ######
-        public
-        ######
-        
-        # Gets the variable, used to validate
-        attr_reader :variable
-
-        # Gets the error messages
-        attr_reader :error
-
-        # Checks for errors and returns either true or false
-        #
-        # Examples:
-        #   @validator.valid?
-        #   # => true
-        #   or 
-        #   # => false
-        #
-        def valid?(errors = {})
-          super
-          return true if self.errors.messages == Hash.new and errors == Hash.new
-          self.error = errors
-          return false
-        end
-
-        # Initializes the Validator
-        # You can pass in a block with validators, which will be used to validate given attributes
-        # 
-        # Blocks look like:
-        #
-        # "#{variable} : type=String : max=200"
-        # "#{textvariable} : type=Hash"
-        # "#{integer} : min=100 : max=200"
-        #
-        # They have always the following format:
-        #   
-        #   KEY=VALUE or KEY!VALUE
-        #
-        #   key=value explains itself. It validates the variable <b>variable</b> with the given <b>key<b> validator
-        #   and checks if it matches the given <b>value</b>
-        #
-        #   key!value is the negociation of key=value
-        #
-        #
-        # The following keys are currently available:
-        #   * type
-        #   * max
-        #   * present
-        #   * min
-        #
-        # Following:
-        #   * contribute yourself
-        #
-        # Usage:
-        #   variable = "This is a simple test"
-        #   validator = GollumRails::Adapters::ActiveModel::Validation.new 
-        #   validator.validate!  do |a|
-        #     a.validate(variable, "type=String,max=100,present=true")
-        #   end 
-        #   validator.valid?
-        #   # => true
-        #
-        # Params:
-        #   block - Block to use
-        #
-        # Returns:
-        def validate(&block)
-          bla = block.call(self)
-        end
-        
-
-        # Aliasing test method
-        alias_method :validate!, :test
-
-        # Tests given variable for conditions
-        #
-        # Params:
-        #   variable - variable to validate
-        #   statement - validation statement, seperated by coma
-        #
-        #
-        def test(variable,statement)
-          validation = {}
-          if statement.include? ',' and statement.include? '='
-            statement.split(',').each{|equalized|
-             key,value = split_equalized_string equalized
-             validation[key.to_s.downcase.to_sym] = value if not key.nil?
-            }
-          elsif statement.include? '='
-            key,value = split_equalized_string statement
-            validation[key.to_s.downcase.to_sym] = value if not key.nil? 
-          else
-            raise Error, 'Syntax error! '
-          end
-          self.instance_variable_set("@variable", variable)
-
-          validation.each_with_index do |k|
-            if k.first.to_s.match /^type$/i
-              code = <<-END
-                self.singleton_class.class_exec do attr_accessor :type end
-                self.instance_variable_set("@type", "#{k[1]}")
-                validates_with ValidateType, :fields => [:variable]
-              END
-            elsif k.first.to_s.match /^(present|presence|pres)$/i
-              code = <<-END
-                validates_presence_of :variable
-              END
-            elsif k.first.to_s.match /^(min|max)$/i
-              code = <<-END
-                validates_length_of :variable, :#{k.first.to_s}imum => #{k[1].to_i}
-              END
-            else
-              puts <<-END
-              WARNING: no validator matches! This will cause an Error in the next release
-              END
-              next
-            end
-            self.instance_eval(code) if code
-          end
-          errors = self.errors.messages
-          self.errors.instance_variable_set("@messages", {})
-          valid? errors
-        end
-  
-        #######
-        private
-        #######
-        
-        # Splits given by "="
-        #
-        # string - String to be split
-        #
-        # Returns splitted string or raise an error
-        def split_equalized_string(string)
-          if string.match /\w+\=(\w+|\d+)/i
-            return string.split(/\=/,2)
-          else
-            raise Error, <<-END 
-              Syntax error in given String #{string}. Equal sign is missing
-            END
-          end
-
-        end
-      end
-
-
-      # Validation helper for type:
-      #
-      # <b>Type</b>
-      class ValidateType < ::ActiveModel::Validator
-
-        # Validate given Data with given validation object
-        #
-        # sets error or returns true
-        def validate(record)
-          if record.type.match(/^\w+$/i)
-            name = eval "#{record.type.to_s}"
-            return true if record.variable.is_a? name
-            record.errors.add :type, "not a kind of given class #{record.type}"
-          else
-            record.errors.add :type ,"invalid input detected"
-          end
-        end
-      end
-    end
-  end
-end