ludy 0.1.3 → 0.1.4

data/CHANGES

@@ -1,5 +1,16 @@
 = ludy changes history
 
+== ludy 0.1.4, 2008.01.31
+
+* added Page#begin and Page#end for real index in the data
+* added Paginator#count for counter.call wrapper
+
+* rename from Ludy::eout to Ludy::erbout
+* added erubis support
+* rename task from erb:preprocess to preprocess:erb and preprocess:erubis
+* task preprocess would preprocess with erb and erubis
+* rename PROJ to Project with open struct. use Project.name now
+
 == ludy 0.1.3, 2008.01.23
 
 * renamed next_page to next, and prev_page to prev

data/Manifest.txt

@@ -56,10 +56,10 @@ lib/ludy/symbol/to_msg.rb
 lib/ludy/symbol/to_proc.rb
 lib/ludy/tasks.rb
 lib/ludy/tasks/common.rb
-lib/ludy/tasks/erb_cpp.rb
-lib/ludy/tasks/erb_cpp/attr_builder.rb
-lib/ludy/tasks/erb_cpp/header_guard.rb
-lib/ludy/tasks/erb_cpp/template_forward_parameters.rb
+lib/ludy/tasks/preprocess_cpp.rb
+lib/ludy/tasks/preprocess_cpp/attr_builder.rb
+lib/ludy/tasks/preprocess_cpp/header_guard.rb
+lib/ludy/tasks/preprocess_cpp/template_forward_parameters.rb
 lib/ludy/test/helper.rb
 lib/ludy/variable.rb
 lib/ludy/y_combinator.rb

data/README

@@ -1,4 +1,4 @@
-= ludy 0.1.3
+= ludy 0.1.4
     by Lin Jen-Shin (a.k.a. godfat 真常)
     strip any number: 18god29fat7029 (at] godfat32 -dooot- 20org
     http://ludy.rubyforge.org
@@ -103,7 +103,7 @@ ludy tasks:
 
 header_guard:
   require 'ludy/tasks/erb_cpp/header_guard'
-  PROJ = 'header_sample' # remember to set project name
+  Project.name = 'header_sample' # remember to set project name
 
   # in utils/SimpleTest.hpp.erb
   <% header_guard do %>
@@ -111,7 +111,7 @@ header_guard:
   <% end %>
 
   # run preprocessing task
-  $ rake erb:preprocessing
+  $ rake preprocessing
 
   # produce:
   #ifndef _HEADER_SAMPLE_UTILS_SIMPLETEST_
@@ -130,7 +130,7 @@ attr_builder:
   };
 
   # run preprocessing task
-  $ rake erb:preprocessing
+  $ rake preprocessing
 
   # produce:
   class MapSetting{
@@ -170,7 +170,7 @@ template_forward_parameters:
   <% } %>
 
   # run preprocessing task
-  $ rake erb:preprocessing
+  $ rake preprocessing
 
   # one of the produce: (can't list all...)
   template <class T0, class T1, class T2, class T3>
@@ -183,6 +183,7 @@ template_forward_parameters:
 * ruby 1.8/1.9 (1.9 is prefered...)
 * rake
 * gem facets if you are using puzzle_generator
+* gem erubis if you are using preprocess:erubis
 
 == INSTALL:
 

data/Rakefile

@@ -6,6 +6,7 @@ load 'tasks/setup.rb'
 
 ensure_in_path 'lib'
 require 'ludy'
+require 'ludy/tasks'
 
 task :default do
   sh 'rake --tasks'
@@ -20,7 +21,7 @@ PROJ.description = paragraphs_of('README', 1).join("\n\n")
 PROJ.changes = paragraphs_of('CHANGES', 0..1).join("\n\n")
 PROJ.rubyforge_name = 'ludy'
 
-PROJ.version = '0.1.3'
+PROJ.version = '0.1.4'
 PROJ.exclude << '.DS_Store' << '^tmp'
 PROJ.dependencies << 'rake'
 

data/TODO

@@ -12,3 +12,7 @@
 * rails multiple layout
 
 * better manifest creating
+
+* better bin/ludy support
+
+* refactor tasks...

data/lib/ludy/kernel/if_else.rb

@@ -8,7 +8,7 @@ module Kernel
   end
   # another else variant...
   def else
-    if self && !self.kind_of?(Blackhole) then self
+    if self && !self.kind_of?(Ludy::Blackhole) then self
     else yield end
   end
 end

data/lib/ludy/paginator.rb

@@ -24,9 +24,13 @@ module Ludy
       @pager == rhs.instance_variable_get('@pager')
     end
     # explicitly fetch the data from pager
-    def fetch; @data = @pager.fetcher[@pager.offset(@page), @pager.per_page]; end
+    def fetch; @data = @pager.fetcher[self.begin, @pager.per_page]; end
     # get the data fetched from pager
     def data; @data ||= fetch; end
+    # the real beginning index
+    def begin; @pager.offset @page; end
+    # the real ending index (need fetch, because we don't know the size)
+    def end; self.begin + self.size - 1; end
     # any other method call would delegate to the data,
     # e.g., each, to_a, map, first, method_you_defined, etc.
     def method_missing msg, *args, &block
@@ -68,14 +72,13 @@ module Ludy
     # nil would be returned. note, page start at 1, not zero.
     def page page
       offset = (page-1)*@per_page
-      size = @counter.call
-      return nil unless page > 0 and offset <= size
+      return nil unless page > 0 and offset <= count
       Page.new self, page
     end
-    # return the number of pages
-    def size
-      (@counter.call/@per_page.to_f).ceil
-    end
+    # return the amount of pages
+    def size; (count/@per_page.to_f).ceil; end
+    # simply call @counter.call
+    def count; @counter.call; end
     alias_method :[], :page
     # get the offset property about the page.
     # it is simply (page-1)*@per_page

data/lib/ludy/tasks/common.rb

@@ -1,7 +1,7 @@
 
 module Ludy
   # append erb output...
-  def self.eout string, binding
+  def self.erbout string, binding
     eval('_erbout', binding) << string
   end
 end

data/lib/ludy/tasks/{erb_cpp → preprocess_cpp}/header_guard.rb

@@ -6,12 +6,12 @@ module Kernel
 # C/C++ header guard generator, you shold provide the final #endif yourself,
 # and you should provide PROJ name for header guard prefix
 def header_guard random_suffix = nil, &block
-  defined = "_#{PROJ.upcase}_#{@dir.upcase}_#{@class.upcase}_#{random_suffix.nil? ? '' : rand.to_s[2..-1]+'_'}"
+  defined = "_#{Project.name.upcase}_#{@dir.upcase}_#{@class.upcase}_#{random_suffix.nil? ? '' : rand.to_s[2..-1]+'_'}"
 
-  Ludy::eout "#ifndef #{defined}
+  Ludy::erbout "#ifndef #{defined}
 #define #{defined}", block.binding
   block.call
-  Ludy::eout '#endif', block.binding
+  Ludy::erbout '#endif', block.binding
 end
 
 end # of ludy

data/lib/ludy/tasks/preprocess_cpp.rb

@@ -0,0 +1,67 @@
+
+require 'rubygems'
+require 'rake/clean'
+require 'ludy'
+Ludy.require_all_in 'tasks/preprocess_cpp'
+require 'erb'
+require 'open-uri'
+require 'ostruct'
+
+Project = OpenStruct.new
+
+namespace :preprocess do
+
+  erb_inputs = FileList['**/*.erb']
+  erb_outputs = erb_inputs.ext
+
+  task :erb_begin do; puts "processing templates: #{erb_inputs.inspect}\n\n"; end
+  task :end do; puts "processing done."; end
+
+  desc 'automaticly translate all *.cpp.erb into *.cpp'
+  task :erb => [:erb_begin, erb_outputs, :end].flatten
+
+  def preprocess template_engine, input, output
+    puts "processing... #{output}"
+    open output, 'w' do |o|
+      @class = output.pathmap '%n'
+      @dir = output.pathmap('%-1d')
+      @indent = '    '
+      @prefix = ''
+      Project.name ||= 'please_set_Project_name_for_your_header_name'
+      o << template_engine.new(input).result(binding)
+    end
+  end
+
+  erb_inputs.zip(erb_outputs).each{ |input, output|
+    file output => input do
+      preprocess ERB, open(input).read, output
+    end
+  }
+
+  erubis_outputs = [] # for people don't have erubis
+  begin
+    require 'erubis'
+    erubis_inputs = FileList['**/*.eruby']
+    erubis_outputs = erubis_inputs.ext
+
+    task :erubis_begin do; puts "processing templates: #{erubis_inputs.inspect}\n\n"; end
+    task :end do; puts "processing done."; end
+
+    desc 'automaticly translate all *.cpp.eruby into *.cpp'
+    task :erubis => [:erubis_begin, erubis_outputs, :end].flatten
+
+    erubis_inputs.zip(erubis_outputs).each{ |input, output|
+      file output => input do
+        class ErboutEruby < Erubis::Eruby; include Erubis::ErboutEnhancer; end
+        preprocess ErboutEruby, open(input).read, output
+      end
+    }
+  rescue LoadError; end # no erubis
+
+  outputs = erb_outputs + erubis_outputs
+  CLEAN.include outputs
+
+end # of namespace preprocess
+
+desc 'run all preprocessing stuffs'
+task :preprocess => ['preprocess:erb','preprocess:erubis']

data/lib/ludy.rb

@@ -12,7 +12,7 @@ require 'rake'
 module Ludy
 
   # :stopdoc:
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   $LOAD_PATH << LIBPATH

data/lib/puzzle_generator/map.rb

@@ -1,7 +1,6 @@
 
 require 'puzzle_generator/misc'
 require 'puzzle_generator/chain'
-require 'ludy/array/body'
 
 require 'rubygems'
 gem 'facets', '>=2.0.0'

data/lib/puzzle_generator/misc.rb

@@ -1,5 +1,6 @@
 
 require 'rubygems'
+gem 'facets', '>=2.0.0'
 require 'facets/kernel/deep_clone'
 require 'facets/array/pad'
 

data/lib/puzzle_generator/puzzle.rb

@@ -4,6 +4,7 @@ require 'puzzle_generator/chained_map'
 require 'puzzle_generator/colored_map'
 
 require 'rubygems'
+gem 'facets', '>=2.0.0'
 require 'facets/array/rotate'
 require 'facets/timer'
 

data/test/test_paginator.rb

@@ -29,6 +29,10 @@ class TestPaginator < Test::Unit::TestCase
     assert_equal(5050, pager.inject(0){|r, i| r += i.inject(&:+) })
 
     assert_equal 4, pager[4].page
+
+    assert_equal 10, pager[2].begin
+    assert_equal 19, pager[2].end
+    assert_equal 100, pager[11].end
   end
   def test_basic
     pager = Ludy::Paginator.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ludy
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Lin Jen-Shin (a.k.a. godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-23 00:00:00 +08:00
+date: 2008-01-31 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,10 +101,10 @@ files:
 - lib/ludy/symbol/to_proc.rb
 - lib/ludy/tasks.rb
 - lib/ludy/tasks/common.rb
-- lib/ludy/tasks/erb_cpp.rb
-- lib/ludy/tasks/erb_cpp/attr_builder.rb
-- lib/ludy/tasks/erb_cpp/header_guard.rb
-- lib/ludy/tasks/erb_cpp/template_forward_parameters.rb
+- lib/ludy/tasks/preprocess_cpp.rb
+- lib/ludy/tasks/preprocess_cpp/attr_builder.rb
+- lib/ludy/tasks/preprocess_cpp/header_guard.rb
+- lib/ludy/tasks/preprocess_cpp/template_forward_parameters.rb
 - lib/ludy/test/helper.rb
 - lib/ludy/variable.rb
 - lib/ludy/y_combinator.rb

data/lib/ludy/tasks/erb_cpp.rb

@@ -1,35 +0,0 @@
-
-require 'rubygems'
-require 'rake/clean'
-require 'ludy'
-Ludy.require_all_in 'tasks/erb_cpp'
-
-namespace :erb do
-
-  inputs = FileList['**/*.erb']
-  outputs = inputs.ext
-  CLEAN.include outputs
-
-  desc 'automaticly translate all *.cpp.erb into *.cpp'
-  task :preprocess => [:begin, outputs, :end].flatten
-  task :begin do; puts "processing templates: #{inputs.inspect}\n\n"; end
-  task :end do; puts "processing done."; end
-
-  require 'erb'
-  require 'open-uri'
-
-  inputs.zip(outputs).each{ |input, output|
-    file output => input do
-      puts "processing... #{output}"
-      open output, 'w' do |o|
-        @class = output.pathmap '%n'
-        @dir = output.pathmap('%-1d')
-        @indent = '    '
-        @prefix = ''
-        PROJ ||= 'please_set_PROJ_for_your_header_name'
-        o << ERB.new(open(input).read).result(binding)
-      end
-    end
-  }
-
-end # of namespace erb