bzsnippets 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in snippets.gemspec
 gemspec

data/lib/snippets/object/env_attribute.rb

@@ -1,57 +1,60 @@
 require 'active_support/concern'
-require 'bzproxies'
+require 'active_support/core_ext/hash'
+require 'pathname'
+require 'delegate'
 module Snippets
   module Object
     module EnvAttribute
       extend ActiveSupport::Concern
 
-      class EnvironmentProxy < Proxy
+      class EnvProxy < Delegator
+        def initialize(value, opts={})
+          super(value)
+          @delegate_sd_obj = value
+          opts[:env] = lambda{opts[:env]} if opts[:env].kind_of? String
+          @options = opts
+        end
+
+        def __setobj__(obj)
+          @delegate_sd_obj = obj
+        end
 
         def __getobj__
           env = @options[:env].call
-          @target[env]
+          hsh = all_envs
+          (hsh.kind_of?(Hash) && hsh[env]) || nil
         end
 
         def all_envs
-          @target
+          if @options[:source].kind_of? Proc
+            if @options[:source].arity == 1
+              @options[:source].call(self)
+            else
+              @options[:source].call
+            end
+          else
+            @delegate_sd_obj ||= fetch_source(@options[:source])
+          end
         end
-      end
 
-      def fetch_source src
-        YAML.load_file(src)
+        private
+
+          def fetch_source value
+            YAML.load(Pathname.new(value).open.read).with_indifferent_access
+          end
       end
 
+
       module ClassMethods
-        def env_attribute *args
-          if (args.last.kind_of?(::Hash) && (args.length > 1))
-            opts = args.pop
+        def env_attribute name, opts={}
+          opts[:env] ||= lambda{(Rails.env if defined? Rails) || RAILS_ENV || "development"}
+          define_method name do
+            v = instance_variable_get("@#{name}")
+            instance_variable_set("@#{name}", EnvProxy.new(nil, opts)) unless v
+            instance_variable_get("@#{name}")
           end
-          opts ||= {}
-          raise "setup :source option" unless opts[:source]
-          if defined? Rails
-            opts[:env] ||= lambda{ Rails.env } 
-          else
-            opts[:env] ||= lambda do
-              if defined? Rails
-                Rails.env
-              else
-                ENV["RAILS_ENV"] || "development"
-              end
-            end
-          end
-          proxy_accessor *args, :proxy => EnvironmentProxy, :source => opts[:source], :env => opts[:env]
-          args.each do |i|
-            old = "_#{i}".to_sym
-            alias_method old, i
-            define_method i do
-              value = self.send(old)
-              unless value
-                self.send("#{i}=", fetch_source(opts[:source]))
-                self.send(old)
-              else
-                value
-              end
-            end
+          define_method "#{name}=" do |value|
+            instance_variable_set("@#{name}", EnvProxy.new(value, opts))
           end
         end
       end

data/lib/snippets/version.rb

@@ -1,3 +1,3 @@
 module Snippets
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/snippets.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Snippets::VERSION
   gem.add_dependency "activesupport", "~> 3"
-  gem.add_dependency "bzproxies", "~> 0.1.7"
+  gem.add_development_dependency "rspec"
 end

data/spec/object/env_attribute_spec.rb

@@ -8,6 +8,7 @@ describe Snippets::Object do
       include Snippets::Object::EnvAttribute
       env_attribute :a, :source => (Pathname.new(__FILE__) + '../../fixtures/config.yml'), :env => lambda{"test"}
       env_attribute :a1, :source => (Pathname.new(__FILE__) + '../../fixtures/config.yml'), :env => lambda{"development"}
+      env_attribute :b, :source => lambda{|i| YAML.load_file(Pathname.new(__FILE__) + '../../fixtures/config.yml')}, :env => lambda{"test"}
     end
   end
   it "should work" do
@@ -29,7 +30,12 @@ describe Snippets::Object do
     a = Tester.new
     a.a1 = YAML.load_file(Pathname.new(__FILE__) + '../../fixtures/config.yml')
     a.a1["adapter"] = "dfsdfdsfdsf"
-    a.a1.target["development"]["adapter"].should == "dfsdfdsfdsf"
+    a.a1["adapter"].should == "dfsdfdsfdsf"
+  end
+
+  it "should allow source lambdas" do
+    a = Tester.new
+    a.b.should == a.a
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bzsnippets
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -28,21 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: bzproxies
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: '0'
 description: Ruby and Rails code snippets
 email:
 - akostrov@spbtv.com
@@ -64,7 +64,6 @@ files:
 - spec/fixtures/config.yml
 - spec/object/env_attribute_spec.rb
 - spec/spec_helper.rb
-- unicorn
 homepage: http://spbtv.com
 licenses: []
 post_install_message: 

data/unicorn

@@ -1,52 +0,0 @@
-#! /bin/sh
-
-# File: /etc/init.d/unicorn
-
-### BEGIN INIT INFO
-# Provides:          unicorn
-# Required-Start:    $local_fs $remote_fs $network $syslog
-# Required-Stop:     $local_fs $remote_fs $network $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: starts the unicorn web server
-# Description:       starts unicorn
-### END INIT INFO
-
-DAEMON="/home/deploy/.rvm/bin/bootup_unicorn_rails"
-DAEMON_OPTS="-c /home/deploy/apps/intranet/production/current/config/unicorn/production.rb -E production -D"
-NAME=unicorn
-DESC="Unicorn app for intranet"
-PID=/home/deploy/apps/intranet/production/shared/pids/unicorn.pid
-
-
-case "$1" in
-  start)
-    echo -n "Starting $DESC: "
-    su - deploy -c "$DAEMON $DAEMON_OPTS"
-    echo "$NAME."
-    ;;
-  stop)
-    echo -n "Stopping $DESC: "
-        kill -QUIT `cat $PID`
-    echo "$NAME."
-    ;;
-  restart)
-    echo -n "Restarting $DESC: "
-        kill -QUIT `cat $PID`
-    sleep 1
-    su - deploy -c "$DAEMON $DAEMON_OPTS"
-    echo "$NAME."
-    ;;
-  reload)
-        echo -n "Reloading $DESC configuration: "
-        kill -HUP `cat $PID`
-        echo "$NAME."
-        ;;
-  *)
-    echo "Usage: $NAME {start|stop|restart|reload}" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
-